From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E13EBCD5BBC for ; Thu, 13 Nov 2025 10:29:13 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vJUWX-0008C1-KX; Thu, 13 Nov 2025 05:25:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vJUWV-00085T-2P for qemu-devel@nongnu.org; Thu, 13 Nov 2025 05:25:51 -0500 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vJUWJ-0007Lt-FG for qemu-devel@nongnu.org; Thu, 13 Nov 2025 05:25:50 -0500 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-b403bb7843eso123971366b.3 for ; Thu, 13 Nov 2025 02:25:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763029538; x=1763634338; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YZJjQ8xbtyy50brabWvBBfeBEDXh6eM2B5I6bn9S5Wg=; b=IeucfDuNJW54IszDIf5E7o46zvbzQGVU3qdxt3vpwUpyZ3bCtkt/7L8+WV6tJOifhQ XzxRY334UR9z4qxyoTs0B6LMRmqH94umzzqtKZhy2XA2BapJSF3I7161WVaZsFtuy6Od I3VID757sq2HkuAkIWVoqS2agH704T2r5ne3hOz879EOoLTdv3bEXbUp8upL4gkepDe9 0pRz3NQc7GNdciDHIAzUUJ3IRhUCLKlzLCyG+YFv3QJml6cWW/WR7PxD7eSzEjiLwpNy ZaEH79DIWZFN86Qj74S8Jd7Dn7fnaOVGkvTiZUIdyiO8jl/vtZNieiBgxGGJDP32IhtI izyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763029538; x=1763634338; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YZJjQ8xbtyy50brabWvBBfeBEDXh6eM2B5I6bn9S5Wg=; b=l2RDWKNp9gBO88qv8isR6YKdrSBVQbWu+agTM/F6ee5owislelhdAc9T7kspoEZIoe Rv+0RfWuPY0JnJ82NoAo54Xz0L1X38XNivs0GSexB4COLFbCOqRAbX3TXwB5Yz5jAiBJ ZwFEHOH7t3AbODbTOmXgfrFGCw88LBy+G/bh+9WgfIfauAJtY+PX4Hoxpzcebsc2xFqq IJQ7kAtUWAe0hAIcjavZysLL9Im51FMeDTjpDUak4w/eee5EreHobboxAkDOexyOU0/e snep+zVP1EwQKkxHEWyfS1P/X3bmCfKsQ5esfe1MW8gT3/tIVTd3RnT0Ei8BuMXXJYtH nwPA== X-Gm-Message-State: AOJu0YzRQepHazEJ8i68May8+9Vb1i1gFFFj9VRyDsMD1EF3XtbIe0Gv 1yz+GSjLj1bn8Zolk26IoCgprh7+zKI9PMOmxkKJJ1gOdsBISoDxiaQpTpKNFltFJQU= X-Gm-Gg: ASbGncukpUFlwnzGazVd2YyrrLzeN4OZDjhhDEg5e59cbwBVVacitunvOUzWnh/7K9A dNnkhbkwdGmuIsI/4d/IN/Og/gTEkmISABJdOAwEkMLD/Tr9y3x328IxYDHbs5/G0UIE3sVo6vE Okkuscz7vr5x/YEPz7NTQJJio/Nwioh3FnYid6ALuMK8PQxcUuyPgqFbpCG/yvO6Xs+snods5m4 ex9PJck2GEULz/gG3SzyCVC5c6SicwLWjZCXPR9zS2WQCQG7R2CflR8LuwaNTZZ/wYjcGlwP761 PvA7vdn4cFraknO4LQwzWoFu2d1nGbVSwqzjAnNrVbiyZtlxTcsVQjlfxHIytBMXZ+rEx7KeWc3 JmwTo1DhZRk8CP17mCs3lqNVjsGq9q4nbVpgPlX46ul7GuwVryqx8suTH5BGjvcoBOVyglY1ctV GE X-Google-Smtp-Source: AGHT+IGzT6EMAq3RcMozh/Tmgzv1nA0h12tlMj0OoeFD1ZGMXCJhNOnkglbF51sCv2Cak8S438NGbg== X-Received: by 2002:a17:907:1c25:b0:b73:278a:a49c with SMTP id a640c23a62f3a-b7331960ca8mr631363666b.2.1763029537293; Thu, 13 Nov 2025 02:25:37 -0800 (PST) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b734fad41f1sm135518666b.23.2025.11.13.02.25.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Nov 2025 02:25:35 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 3EA415F7DF; Thu, 13 Nov 2025 10:25:27 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paul Durrant , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Dmitry Osipenko , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Sriram Yagnaraman , Gustavo Romero , Paolo Bonzini , Zhao Liu , Kohei Tokunaga , Akihiko Odaki , Thomas Huth , BALATON Zoltan , Peter Maydell , qemu-arm@nongnu.org, qemu-s390x@nongnu.org, Li-Wen Hsu , David Woodhouse , Ed Maste Subject: [PATCH v2 13/18] gitlab: use template for ubuntu-24.04-s390x jobs Date: Thu, 13 Nov 2025 10:25:19 +0000 Message-ID: <20251113102525.1255370-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251113102525.1255370-1-alex.bennee@linaro.org> References: <20251113102525.1255370-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x633.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Most of the test is pure boilerplate so to save ourselves from repetition move all the main bits into a minimal copy of native_build_job_template but without the caching. We keep all the current allow_fail, manual and configure setups but do take the opportunity to replace the inline nproc calls to using a common JOBS variable. Signed-off-by: Alex Bennée --- v2 - keep when: manual on the relevant jobs --- .../custom-runners/ubuntu-24.04-s390x.yml | 185 +++++++----------- 1 file changed, 70 insertions(+), 115 deletions(-) diff --git a/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml index 45dbee17880..32e12188873 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml @@ -2,129 +2,84 @@ # setup by the scripts/ci/setup/ubuntu/build-environment.yml task # "Install basic packages to build QEMU on Ubuntu 24.04" +.ubuntu_s390x_template: + extends: .custom_runner_template + needs: [] + stage: build + tags: + - ubuntu_24.04 + - s390x + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' + - if: "$S390X_RUNNER_AVAILABLE" + before_script: + - source scripts/ci/gitlab-ci-section + - section_start setup "Pre-script setup" + - JOBS=$(expr $(nproc) - 1) + - section_end setup + script: + - mkdir build + - cd build + - section_start configure "Running configure" + - ../configure $CONFIGURE_ARGS || + { cat config.log meson-logs/meson-log.txt; exit 1; } + - section_end configure + - section_start build "Building QEMU" + - make --output-sync -j"$JOBS" + - section_end build + - section_start test "Running tests" + - if test -n "$MAKE_CHECK_ARGS"; + then + make -j"$JOBS" $MAKE_CHECK_ARGS ; + fi + - section_end test + ubuntu-24.04-s390x-all-linux: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - s390x - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - - if: "$S390X_RUNNER_AVAILABLE" - script: - - mkdir build - - cd build - - ../configure --enable-debug --disable-system --disable-tools --disable-docs - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc` - - make --output-sync check-tcg - - make --output-sync -j`nproc` check + extends: .ubuntu_s390x_template + needs: [] + variables: + CONFIGURE_ARGS: --enable-debug --disable-system --disable-tools --disable-docs + MAKE_CHECK_ARGS: check-tcg check ubuntu-24.04-s390x-all-system: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - s390x - timeout: 75m - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - allow_failure: true - - if: "$S390X_RUNNER_AVAILABLE" - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-user - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check + extends: .ubuntu_s390x_template + needs: [] + variables: + CONFIGURE_ARGS: --disable-user + MAKE_CHECK_ARGS: check + allow_failure: true ubuntu-24.04-s390x-alldbg: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - s390x - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - - if: "$S390X_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --enable-debug - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make clean - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check + extends: .ubuntu_s390x_template + needs: [] + variables: + CONFIGURE_ARGS: --enable-debug + MAKE_CHECK_ARGS: check + allow_failure: true + when: manual ubuntu-24.04-s390x-clang: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - s390x - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - - if: "$S390X_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --cc=clang --cxx=clang++ --enable-ubsan - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check + extends: .ubuntu_s390x_template + needs: [] + variables: + CONFIGURE_ARGS: --cc=clang --cxx=clang++ --enable-ubsan + MAKE_CHECK_ARGS: check + allow_failure: true + when: manual ubuntu-24.04-s390x-tci: - needs: [] - stage: build - tags: - - ubuntu_24.04 - - s390x - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - - if: "$S390X_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --enable-tcg-interpreter - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc` + extends: .ubuntu_s390x_template + needs: [] + variables: + CONFIGURE_ARGS: --enable-tcg-interpreter + allow_failure: true + when: manual ubuntu-24.04-s390x-notcg: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - s390x - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - when: manual - allow_failure: true - - if: "$S390X_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-tcg - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check + extends: .ubuntu_s390x_template + needs: [] + variables: + CONFIGURE_ARGS: --disable-tcg + MAKE_CHECK_ARGS: check + allow_failure: true + when: manual -- 2.47.3