From nobody Fri Nov 14 19:40:00 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1760957003; cv=none; d=zohomail.com; s=zohoarc; b=IIQt5XoGeFAyyCicz+QYZQTMo/8/NlYvcIrfNgz1RLdGU+0JtLB2ltQaUS0YKjmgrJg1bNBU/6fqRJHNBXNPzGwbtGFTuxC9J8Yd9thuhvMII+So9qN2wgDCG/Jbd07MzZdVWJY2Of+aq9dnMSKGZT+Zu9VYEYxfx8R4DHYxkz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760957003; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jE4c+DzA7hGd1ZZ06SZYxXAmtQ/3gkE36PLjdjn6oR0=; b=GCxTr/l2m0O7hz3eNMBC7KKXtuGwrtF6UHxT2yTvWNjYoTgv2uEmz4JsKykvACWYlZCwXDhQAuvfosi6bnvncitpp6cUd6Z7HqpeIBjCes79ks7ICfBaFGX1xJ+v0/ujFoqLG/gTSECRLSKYeLIuEeCS0PTFlbgY2qUuurTfkp8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760957003191665.7456906588947; Mon, 20 Oct 2025 03:43:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAnKx-0007XM-DH; Mon, 20 Oct 2025 06:41:59 -0400 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 1vAnKu-0007W5-VH for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:41:56 -0400 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vAnKr-0000fi-Q6 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 06:41:56 -0400 Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-b3dbf11fa9eso801786566b.0 for ; Mon, 20 Oct 2025 03:41:53 -0700 (PDT) Received: from draig.lan ([185.126.160.19]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b65e8391547sm761197266b.22.2025.10.20.03.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Oct 2025 03:41:50 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A8BC95F85F; Mon, 20 Oct 2025 11:41:49 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760956911; x=1761561711; 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=jE4c+DzA7hGd1ZZ06SZYxXAmtQ/3gkE36PLjdjn6oR0=; b=n1ncR1BrG0gmqAzdkNbPf0jcW59HyjpwSRnLomJkr2D7pVhOpDkmABD+sFR5S3wINs n3IV3pe9RMpPiaL3+5spx8S9AzTOsWw5I4n64wvHP8J0s5HTNgh161J/NPtrUyywSYyb 9zT9P7D2DKU57OofGTYpWorMogvr3BDEiO4IhsyU+kRQ33G/mfL2qX2r3QCmkh0jMexk 1ZQiXM+nF1d64/jsj7r7TXmewhKNIER9RIG+g3x7PWMe/loVbQcQpNE0xtrmYPjJtly2 nzMFaqwAajDV1+ZcLSuy6iRFx8IG+kRlmDzafas5om+vK3JRf098tn0IgJM4+DztPMPn NlsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760956911; x=1761561711; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jE4c+DzA7hGd1ZZ06SZYxXAmtQ/3gkE36PLjdjn6oR0=; b=Iiy8rjxtNpqMbilOufRu85aeBr4EKHHOuMPwf9I4oWjWSoYCtlSJvgNfMUY2TzuwHu HbqiAzYKnLKMTOeOGkP2pCPCsgd7vQzP2SqdK5K0KaOXQWnXHQglm6irjH5rhr+QDqzj cyTtNgSYXRetaXv7yDYVMYlFgXSoLr2EqjlcIxzf4my7ABsziVGEyvNYhwmkEpS9+L3f kZAwgXtI1EQIRaadL4b3BAL098H+PjAY4/zX8BlST1Ni5Sa6Bm3DvA6u/NoMCL5w8uKL 500nPS4LfYrpXPalcMxXyfKfLvWFQ2zN+v3gmwtdtO6We8TRrJ2o7JS/4F6qF/fGCLCA 5ivg== X-Gm-Message-State: AOJu0YyBwpOFDLD89Gp3XJYPQAaCF20PZyTlIzOCIZ3+r1gJAH4HALHt 5+C8EC9T/+bBIbnryEcKXN3IGP824DLxP/qFAabjqdZ7wfaSwEX/D+/F3awVC8/wW8g= X-Gm-Gg: ASbGncuBiPRY2WnmM+e9HeYWxeO10MI0r3vajqTKRiCBTypHuTKGzCR06j2aSXj4D+4 rO/eA7S6j2/k1sCMwVHnSUQzad+t5RdVAaQ6HRIZ7UKAhuetE272VfEYqOZklWTRjqzXcL2UYIU 6CbCUg0lJpk9vmPgqZw1LlgdOhloGD4LeTKukvTZrHdBFBZ9GrqN+AEP4dZCo7y55JN4sSyJx9r cN7yoK/aKu4g2uRRPpsdkczo+6ww1A4vQm1BElpNA1zRSOdfMx0hHmT3rZWjAadati4R5/bfbjx JKUnJwS0B4+cnN3jq5oKN1tlB5Ar8tlsLtXoQUbjCLCmC1HhicB27Ft8ifwJFsdfK2U/1GHonKT 0aRNXjh5FAj2UveCSe4vqr0yUIUTFp0U2rIRK24aBvQ3jcTgsm0R7zZYymFYg22yrKfdgZ3Nbj9 NDjaclju67D+pE2HLrgndWyw== X-Google-Smtp-Source: AGHT+IGFAZlSSm1QjMgKAiApb+9UtWNbIXiLZiy92fc+gVIA5oeyJCRs5mtDPpsTvbhnpxGR6+O2HA== X-Received: by 2002:a17:906:c144:b0:b04:3e43:eccc with SMTP id a640c23a62f3a-b64739502dcmr1595601366b.40.1760956910983; Mon, 20 Oct 2025 03:41:50 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PULL 01/11] gitlab: use template for ubuntu-24.04-aarch64 jobs Date: Mon, 20 Oct 2025 11:41:39 +0100 Message-ID: <20251020104149.4034124-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251020104149.4034124-1-alex.bennee@linaro.org> References: <20251020104149.4034124-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62a.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=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1760957005186154100 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 and configure setups but do take the opportunity to replace the -j`nproc --ignore=3D40` hack with something that almost, but not quite, saturates the machine its being built on. Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier Message-ID: <20251016150357.876415-2-alex.bennee@linaro.org> Signed-off-by: Alex Benn=C3=A9e diff --git a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml b/.gitlab= -ci.d/custom-runners/ubuntu-24.04-aarch64.yml index d26c7827f45..46db9ae0138 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml @@ -2,150 +2,112 @@ # setup by the scripts/ci/setup/ubuntu/build-environment.yml task # "Install basic packages to build QEMU on Ubuntu 24.04" =20 +.ubuntu_aarch64_template: + extends: .custom_runner_template + needs: [] + stage: build + tags: + - ubuntu_24.04 + - aarch64 + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D~ /^staging/' + - if: "$AARCH64_RUNNER_AVAILABLE" + before_script: + - source scripts/ci/gitlab-ci-section + - section_start setup "Pre-script setup" + - JOBS=3D$(expr $(nproc) - 4) + - 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-aarch64-all-linux-static: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - - if: "$AARCH64_RUNNER_AVAILABLE" - script: - - mkdir build - - cd build - # Disable -static-pie due to build error with system libc: - # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1987438 - - ../configure --enable-debug --static --disable-system --disable-pie - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc --ignore=3D40` - - make check-tcg - - make --output-sync -j`nproc --ignore=3D40` check + extends: .ubuntu_aarch64_template + variables: + # Disable -static-pie due to build error with system libc: + # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1987438 + CONFIGURE_ARGS: --enable-debug --static --disable-system --disable-pie + MAKE_CHECK_ARGS: check-tcg =20 ubuntu-24.04-aarch64-all: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc --ignore=3D40` - - make --output-sync -j`nproc --ignore=3D40` check + extends: .ubuntu_aarch64_template + variables: + MAKE_CHECK_ARGS: check + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true =20 ubuntu-24.04-aarch64-without-defaults: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-user --without-default-devices --without-default= -features - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc --ignore=3D40` - - make --output-sync -j`nproc --ignore=3D40` check + extends: .ubuntu_aarch64_template + variables: + CONFIGURE_ARGS: --disable-user --without-default-devices --without-def= ault-features + MAKE_CHECK_ARGS: check + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true =20 ubuntu-24.04-aarch64-alldbg: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - - if: "$AARCH64_RUNNER_AVAILABLE" - 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 --ignore=3D40` - - make --output-sync -j`nproc --ignore=3D40` check + extends: .ubuntu_aarch64_template + variables: + CONFIGURE_ARGS: --enable-debug + MAKE_CHECK_ARGS: check-tcg =20 ubuntu-24.04-aarch64-clang: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-libssh --cc=3Dclang --cxx=3Dclang++ --enable-ubs= an - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc --ignore=3D40` - - make --output-sync -j`nproc --ignore=3D40` check + extends: .ubuntu_aarch64_template + variables: + CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --enable-ubsan + MAKE_CHECK_ARGS: check + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true =20 ubuntu-24.04-aarch64-tci: - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_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 --ignore=3D40` + extends: .ubuntu_aarch64_template + variables: + CONFIGURE_ARGS: --enable-tcg-interpreter + MAKE_CHECK_ARGS: check + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true =20 ubuntu-24.04-aarch64-notcg: - extends: .custom_runner_template - needs: [] - stage: build - tags: - - ubuntu_24.04 - - aarch64 - rules: - - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' - when: manual - allow_failure: true - - if: "$AARCH64_RUNNER_AVAILABLE" - when: manual - allow_failure: true - script: - - mkdir build - - cd build - - ../configure --disable-tcg --with-devices-aarch64=3Dminimal - || { cat config.log meson-logs/meson-log.txt; exit 1; } - - make --output-sync -j`nproc --ignore=3D40` - - make --output-sync -j`nproc --ignore=3D40` check + extends: .ubuntu_aarch64_template + variables: + CONFIGURE_ARGS: --disable-tcg --with-devices-aarch64=3Dminimal + MAKE_CHECK_ARGS: check + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D~ /^staging/' + when: manual + allow_failure: true + - if: "$AARCH64_RUNNER_AVAILABLE" + when: manual + allow_failure: true --=20 2.47.3