From nobody Sun Jul 26 11:54:36 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1782305278; cv=none; d=zohomail.com; s=zohoarc; b=cEFTDM1zAWwxdPM6cYRbBpJs9IxWLnBfyVNCEfrG8rlmYvOqaWQl17TlC0Uklq0MXt4RVmTCAG6PHSOrtJTOCnJ4nAL49XCNWB+ndfOTPjh49+yfJ/VlpxX8dLPFmB6hESicD+9I9tJ8/fdzAMLZd8bQ3qwYp4OQZtEAucyhIOQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782305278; 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=QjfT6GkoDzQtZ/55VgqI8R5vgqIwgAo72y4xMLz8GIQ=; b=ALWhbyeOBSX1qzP8ULWkCcOzEnQ6Mng2knp7NvgLXIJ+//K6j9OpxpOh1AzpOHnDsWLd7MR2F9qRCyNCPcnlhBN/iufKreTvCyX22Uk6cP3nEQ66OMHSLERTwGAnmox/g3btKmaf+XjX2OcBdLsLqlnTyvNp2OaWNhXIFC/zdAc= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782305278766846.7524648322037; Wed, 24 Jun 2026 05:47:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcN1I-0005Dz-Ch; Wed, 24 Jun 2026 08:47:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcN0V-0004SO-G4 for qemu-devel@nongnu.org; Wed, 24 Jun 2026 08:47:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcN0U-0006Ww-67 for qemu-devel@nongnu.org; Wed, 24 Jun 2026 08:47:07 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-615-XD05ltseOzS_RzEAAm1gDg-1; Wed, 24 Jun 2026 08:47:04 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3E4011955F79; Wed, 24 Jun 2026 12:47:03 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.57]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B86831955F7B; Wed, 24 Jun 2026 12:47:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782305225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QjfT6GkoDzQtZ/55VgqI8R5vgqIwgAo72y4xMLz8GIQ=; b=QlSVahxoliORVGvHhPg4Cbui0Vk4m/FZBFL/y5t5Xm0n8xUkg7HW7qGqiNEdAVsZ7TwtVI kBEiq2N/N6nIiQMyMPfvHntUwDvi24uUUevDpMje64JORBzMVKdTDs/aQ7NOrecl/wiSL6 KaIFMBXk6XmimsZIUElvoTkg+dcxn94= X-MC-Unique: XD05ltseOzS_RzEAAm1gDg-1 X-Mimecast-MFC-AGG-ID: XD05ltseOzS_RzEAAm1gDg_1782305223 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 1/6] gitlab: remove unused .cross_test_artifacts template Date: Wed, 24 Jun 2026 13:46:52 +0100 Message-ID: <20260624124657.2725376-2-berrange@redhat.com> In-Reply-To: <20260624124657.2725376-1-berrange@redhat.com> References: <20260624124657.2725376-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1782305279412158500 This is unused since commit 0d1137550bbf3af7ebe34801a9bff5a4839cc34e Author: Richard Henderson Date: Thu Dec 18 09:58:33 2025 +1100 gitlab: Remove 32-bit host testing Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- .gitlab-ci.d/crossbuild-template.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild= -template.yml index 58136d06e4..786c5cdb88 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -119,15 +119,3 @@ $MAKE -j"$JOBS" $MAKE_CHECK_ARGS ; fi - section_end test - -# We can still run some tests on some of our cross build jobs. They can ad= d this -# template to their extends to save the build logs and test results -.cross_test_artifacts: - artifacts: - name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - when: always - expire_in: 7 days - paths: - - build/meson-logs - reports: - junit: build/meson-logs/*.junit.xml --=20 2.54.0 From nobody Sun Jul 26 11:54:36 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1782305309; cv=none; d=zohomail.com; s=zohoarc; b=DIOiGM8R20krNb7tyQFduAbzUP7CI0cFzbgKrhURNkc/zgWKrDgsHJn9h4Zg359wZk9CqPq1/SZ/qUGvmckT9sjC+O8wg2eOUptF4XroOTAlCmBKtYNzsXmn/obpre34IjQhdLzcfmE+1de/TpDoTL0IKY3SaLCNbK71csFj4E8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782305309; 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=7pMOxsT8ySu/3aDedy1T18ifFSESdGAWeg2Erc61moY=; b=IP3btGaqSuZNWXv4SW8vxSt5TCRaZMzYevqOEIUHyJ4gKPR8rriIGCWkgKmdmeMWzFcaohPquNwidwIf4ccf6sv++tIan3jZMWE+BCvHDL43atPZCZg4LlA0Vkkmlgb+t4uYkJpFMYY8aVRWHoaMKELK3fVATdYingknNoIfr4o= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782305309026954.1409340829839; Wed, 24 Jun 2026 05:48:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcN1N-000683-DY; Wed, 24 Jun 2026 08:48:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcN0c-0004Z5-19 for qemu-devel@nongnu.org; Wed, 24 Jun 2026 08:47:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcN0Z-0006Xc-9L for qemu-devel@nongnu.org; Wed, 24 Jun 2026 08:47:13 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-413-04c5SbdHNry_sTzP3cXvRw-1; Wed, 24 Jun 2026 08:47:06 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 238AA1956080; Wed, 24 Jun 2026 12:47:05 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.57]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AB9B61956049; Wed, 24 Jun 2026 12:47:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782305229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7pMOxsT8ySu/3aDedy1T18ifFSESdGAWeg2Erc61moY=; b=hy1VLHDwxLTXJiU4zA/s3o7HxSuecjqjeVdlJCgvyzkA5XXiGyFmkCfwazIzjyZBdySsbb SpUOSlr+INHjiWXAYDsaMvRjaEx6+FJv5o9mqoSxw0XAyqA5mvjifWrhl3Ss8i0r223ut4 nH4u0tn6DV23ll/GX4Kz/+qWTdk/m+Q= X-MC-Unique: 04c5SbdHNry_sTzP3cXvRw-1 X-Mimecast-MFC-AGG-ID: 04c5SbdHNry_sTzP3cXvRw_1782305225 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 2/6] gitlab: move .meson_job_template into base.yaml Date: Wed, 24 Jun 2026 13:46:53 +0100 Message-ID: <20260624124657.2725376-3-berrange@redhat.com> In-Reply-To: <20260624124657.2725376-1-berrange@redhat.com> References: <20260624124657.2725376-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1782305309335158500 Rename .meson_job_template to .base_meson_job_template and move it into base.yml, in prep for wider reuse. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pierrick Bouvier --- .gitlab-ci.d/base.yml | 14 ++++++++++++++ .gitlab-ci.d/buildtest-template.yml | 20 +++----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index 72eadc8073..dc36a1ca11 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -129,3 +129,17 @@ variables: QEMU_CI_CONTAINER_TAG: $CI_COMMIT_REF_SLUG =20 - when: on_success + +# Any job running meson should capture meson logs +# by default. Some jobs might override the artifacts +# to capture further files +.base_meson_job_template: + extends: .base_job_template + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + when: always + expire_in: 7 days + paths: + - build/meson-logs + reports: + junit: build/meson-logs/*.junit.xml diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index 005058625e..0fa2351d87 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -1,20 +1,6 @@ =20 -# Any job running meson should capture meson logs -# by default. Some jobs might override the artifacts -# to capture further files -.meson_job_template: - extends: .base_job_template - artifacts: - name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" - when: always - expire_in: 7 days - paths: - - build/meson-logs - reports: - junit: build/meson-logs/*.junit.xml - .native_build_job_template: - extends: .meson_job_template + extends: .base_meson_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG cache: @@ -75,7 +61,7 @@ - build/**/*.c.o.d =20 .common_test_job_template: - extends: .meson_job_template + extends: .base_meson_job_template stage: test image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG script: @@ -133,7 +119,7 @@ QEMU_JOB_FUNCTIONAL: 1 =20 .wasm_build_job_template: - extends: .meson_job_template + extends: .base_meson_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG before_script: --=20 2.54.0 From nobody Sun Jul 26 11:54:36 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1782305307; cv=none; d=zohomail.com; s=zohoarc; b=GWCTBCttwdMV847inKe46Y1FocPGbmr5jdaPpk/E8Kky/l78i0ilfn2AIQYrGVUcymjnzRWuZZYK9trmlfqXVNTLhNjcfxTlna/ZCXV4aVaUTQoEVz0QWycHNT5ILzl6pO4XzPbpyA0bug9WPWRWBPlHTRxAZbNycOGK56+Xnxw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782305307; 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=O2vEJoEtspcEC6rFq5A+xvHDEfbqZ0UkfiI8kiwK608=; b=cSRP1nnVQ5r0k+GweT/MkSR/g0Ds7UR6LZq5a+rAxDT0EW0dmfSF9c044xR4tg83oqGmVBFpYIqJS+mTM0i9k8XzYjj6AWvafhqksRdAlK0r4BHE1/Tl6BsQ4uznMGLozzYDYc4X2nH9AUwZ9w7uI4Wx2VRglHZ4cpQZlbVAwCg= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782305307296222.9633857916125; Wed, 24 Jun 2026 05:48:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcN1J-0005Po-E5; Wed, 24 Jun 2026 08:47:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcN0b-0004Yr-IN for qemu-devel@nongnu.org; Wed, 24 Jun 2026 08:47:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcN0Z-0006Xh-99 for qemu-devel@nongnu.org; Wed, 24 Jun 2026 08:47:13 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-694-6Ec1hrjYPkKXez7YFoDpWQ-1; Wed, 24 Jun 2026 08:47:08 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 42FDF1800586; Wed, 24 Jun 2026 12:47:07 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.57]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C37ED1956049; Wed, 24 Jun 2026 12:47:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782305230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O2vEJoEtspcEC6rFq5A+xvHDEfbqZ0UkfiI8kiwK608=; b=MOQLxbUKuJ4XKdiMrn9+hgQx9YUKeqIKBkLmIIOHGTrLH8K6Gg7nXjqTS2nv2u6l1RVZdV vk8z01x7vbQjg0cIqCsH+D45cJ5dpSepP36l8JZIan2W1zIo1OLp/hNPdcoNMVAJ7cgpi4 pVKA7ShDPzju9zpIEwwitypTJ3JHl/Q= X-MC-Unique: 6Ec1hrjYPkKXez7YFoDpWQ-1 X-Mimecast-MFC-AGG-ID: 6Ec1hrjYPkKXez7YFoDpWQ_1782305227 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 3/6] gitlab: use .base_meson_job_template from crossbuild jobs Date: Wed, 24 Jun 2026 13:46:54 +0100 Message-ID: <20260624124657.2725376-4-berrange@redhat.com> In-Reply-To: <20260624124657.2725376-1-berrange@redhat.com> References: <20260624124657.2725376-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1782305309362158502 This ensures that crossbuild jobs capture the build/meson-logs content as artifacts to aid in debugging. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pierrick Bouvier --- .gitlab-ci.d/crossbuild-template.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild= -template.yml index 786c5cdb88..36bb9a405c 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -1,5 +1,5 @@ .cross_system_build_job: - extends: .base_job_template + extends: .base_meson_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG cache: @@ -54,7 +54,7 @@ # KVM), and set extra options (such disabling other accelerators) via the # $EXTRA_CONFIGURE_OPTS variable. .cross_accel_build_job: - extends: .base_job_template + extends: .base_meson_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG timeout: 60m @@ -87,7 +87,7 @@ - section_end test =20 .cross_user_build_job: - extends: .base_job_template + extends: .base_meson_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG cache: --=20 2.54.0 From nobody Sun Jul 26 11:54:36 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1782305313; cv=none; d=zohomail.com; s=zohoarc; b=iqG4m9zv4cLwxQGjFSExlatf7q3+W1eXRWVj9Vf8tnlVmicIJIG0FUSZNjgUZtOdp2MsLmbjcbGX4avwnXdpv5teVywoEgatn+Ew/kY3HEx8nyT/N4Ug5IzJ4ipFmfUrWTVFVo4AjBTYVH2lznBqbiStDW+4sVEkgwcYT3psAuo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782305313; 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=nC5BWqSoFDGol8qL1Iqk8USAmrA3A8NrfIL1Ufwfc+8=; b=MOPCF0n9VydqiUhTstCIwfETe/ZCzZpmczVOX4EP3DY16OYNdDt3DaGCVV95gr/jZbMxxSYXdCk4X37Dq9klF8AyVWHcmVXVvL+9G23b58zA2jFIGKPYd+TExS7f6XTttRBKI2cpL3QgD2eWQiW2lvobS2ga/AWmNn57fnxsRD0= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782305313011279.85998593810496; Wed, 24 Jun 2026 05:48:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcN1N-0006BC-Pk; Wed, 24 Jun 2026 08:48:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcN0e-0004mo-J9 for qemu-devel@nongnu.org; Wed, 24 Jun 2026 08:47:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcN0c-0006Y0-RZ for qemu-devel@nongnu.org; Wed, 24 Jun 2026 08:47:16 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-161-NnJ7aZmxNW66kU_QZv9osw-1; Wed, 24 Jun 2026 08:47:10 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5C0F11955F72; Wed, 24 Jun 2026 12:47:09 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.57]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E216A1956049; Wed, 24 Jun 2026 12:47:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782305233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nC5BWqSoFDGol8qL1Iqk8USAmrA3A8NrfIL1Ufwfc+8=; b=UxQuu158e9BS1z1yXWzYCVeKebb4aOgDd1HPlJ70drYMGahV8lsI7kPq/ljFMauKQYo672 6uvrWh84Xcy4Xzu4VJqOH2ro2zMMI6vWGfcIF1L3mYltQpu78im1ZKkwsqKUq4yz6gmASw 94T1rvWSHYX6uGNJp6ntAt6hoNWnSYA= X-MC-Unique: NnJ7aZmxNW66kU_QZv9osw-1 X-Mimecast-MFC-AGG-ID: NnJ7aZmxNW66kU_QZv9osw_1782305229 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 4/6] gitlab: pull ccache setup into .base_meson_ccache_job_template Date: Wed, 24 Jun 2026 13:46:55 +0100 Message-ID: <20260624124657.2725376-5-berrange@redhat.com> In-Reply-To: <20260624124657.2725376-1-berrange@redhat.com> References: <20260624124657.2725376-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1782305313378158500 This provides a consistent ccache setup across all build jobs. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pierrick Bouvier --- .gitlab-ci.d/base.yml | 16 +++++++++++++ .gitlab-ci.d/buildtest-template.yml | 14 ++--------- .gitlab-ci.d/crossbuild-template.yml | 35 +++++----------------------- 3 files changed, 24 insertions(+), 41 deletions(-) diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index dc36a1ca11..6289c7e5c3 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -143,3 +143,19 @@ variables: - build/meson-logs reports: junit: build/meson-logs/*.junit.xml + +.base_meson_ccache_job_template: + extends: .base_meson_job_template + cache: + paths: + - ccache + key: "$CI_JOB_NAME" + when: always + script: + - export CCACHE_BASEDIR=3D"$(pwd)" + - export CCACHE_DIR=3D"$CCACHE_BASEDIR/ccache" + - export CCACHE_MAXSIZE=3D"500M" + - export PATH=3D"$CCACHE_WRAPPERSDIR:$PATH" + - ccache --zero-stats + after_script: + - ccache --show-stats diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index 0fa2351d87..8dfd17a0b5 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -1,13 +1,8 @@ =20 .native_build_job_template: - extends: .base_meson_job_template + extends: .base_meson_ccache_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG - cache: - paths: - - ccache - key: "$CI_JOB_NAME" - when: always before_script: - source scripts/ci/gitlab-ci-section - section_start setup "Pre-script setup" @@ -15,14 +10,10 @@ - cat /packages.txt - section_end setup script: - - export CCACHE_BASEDIR=3D"$(pwd)" - - export CCACHE_DIR=3D"$CCACHE_BASEDIR/ccache" - - export CCACHE_MAXSIZE=3D"500M" - - export PATH=3D"$CCACHE_WRAPPERSDIR:$PATH" + - !reference [.base_meson_ccache_job_template, script] - du -sh .git - mkdir build - cd build - - ccache --zero-stats - section_start configure "Running configure" - ../configure --enable-werror --disable-docs --enable-fdt=3Dsystem --disable-debug-info @@ -43,7 +34,6 @@ $MAKE -j"$JOBS" $MAKE_CHECK_ARGS ; fi - section_end test - - ccache --show-stats =20 # We jump some hoops in common_test_job_template to avoid # rebuilding all the object files we skip in the artifacts diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild= -template.yml index 36bb9a405c..aadae26844 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -1,12 +1,7 @@ .cross_system_build_job: - extends: .base_meson_job_template + extends: .base_meson_ccache_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG - cache: - paths: - - ccache - key: "$CI_JOB_NAME" - when: always timeout: 80m before_script: - source scripts/ci/gitlab-ci-section @@ -15,13 +10,9 @@ - cat /packages.txt - section_end setup script: - - export CCACHE_BASEDIR=3D"$(pwd)" - - export CCACHE_DIR=3D"$CCACHE_BASEDIR/ccache" - - export CCACHE_MAXSIZE=3D"500M" - - export PATH=3D"$CCACHE_WRAPPERSDIR:$PATH" + - !reference [.base_meson_ccache_job_template, script] - mkdir build - cd build - - ccache --zero-stats - section_start configure "Running configure" - ../configure --enable-werror --disable-docs --enable-fdt=3Dsystem --disable-user $QEMU_CONFIGURE_OPTS $EXTRA_CONFIGURE_OPTS @@ -46,7 +37,6 @@ mv -v qemu-setup*.exe qemu-setup-${version}.exe; fi - section_end installer - - ccache --show-stats =20 # Job to cross-build specific accelerators. # @@ -54,22 +44,15 @@ # KVM), and set extra options (such disabling other accelerators) via the # $EXTRA_CONFIGURE_OPTS variable. .cross_accel_build_job: - extends: .base_meson_job_template + extends: .base_meson_ccache_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG timeout: 60m - cache: - paths: - - ccache/ - key: "$CI_JOB_NAME" before_script: - source scripts/ci/gitlab-ci-section - JOBS=3D$(expr $(nproc) + 1) script: - - export CCACHE_BASEDIR=3D"$(pwd)" - - export CCACHE_DIR=3D"$CCACHE_BASEDIR/ccache" - - export CCACHE_MAXSIZE=3D"500M" - - export PATH=3D"$CCACHE_WRAPPERSDIR:$PATH" + - !reference [.base_meson_ccache_job_template, script] - mkdir build - cd build - section_start configure "Running configure" @@ -87,20 +70,14 @@ - section_end test =20 .cross_user_build_job: - extends: .base_meson_job_template + extends: .base_meson_ccache_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG - cache: - paths: - - ccache/ - key: "$CI_JOB_NAME" before_script: - source scripts/ci/gitlab-ci-section - JOBS=3D$(expr $(nproc) + 1) script: - - export CCACHE_BASEDIR=3D"$(pwd)" - - export CCACHE_DIR=3D"$CCACHE_BASEDIR/ccache" - - export CCACHE_MAXSIZE=3D"500M" + - !reference [.base_meson_ccache_job_template, script] - mkdir build - cd build - section_start configure "Running configure" --=20 2.54.0 From nobody Sun Jul 26 11:54:36 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1782305290; cv=none; d=zohomail.com; s=zohoarc; b=Bh3NxI6jqrc6Io0fXQV9I7SlfSZuxLWKBeYAiSICHBXdw6hDsVYWgVpvPcB7EblizdPpovvnwQbOCATEB2vg+AVcvwGHEZbOmkQ4VGGtC4OfwL9ul5IsmiR/jsVZ133FMq+dHECAw3UxTqmVklJqrrRSKBOZ77J0DvDJ8jopsQk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782305290; 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=U2A4QuDgemvw1Sf+etVFj4hgRALEHALqTXi3Iy1ErUg=; b=NwP3wfcaRHxkvGk4rwwVFW24CXtuU5PmvKlBA9geg36SzbIGzxSLU0EcfW4GkSmGWKoMiWp0IPk5hBnuspwxJqfQj5lZr8J9xeQ+6WQlRJQiR0kOJ3+RyxArSiFsOnI7qOQm9R3ZVt0zQ50vm+gCUbViW5IU6JfmfmFZgxz4xxk= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782305290196746.3630370290413; Wed, 24 Jun 2026 05:48:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcN1L-0005mu-9q; Wed, 24 Jun 2026 08:47:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcN0h-0004o1-E3 for qemu-devel@nongnu.org; Wed, 24 Jun 2026 08:47:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcN0e-0006YE-8N for qemu-devel@nongnu.org; Wed, 24 Jun 2026 08:47:17 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-211-K3xmHSqMNyeshdYPz4O4CQ-1; Wed, 24 Jun 2026 08:47:12 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 40B761956080; Wed, 24 Jun 2026 12:47:11 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.57]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C94791956049; Wed, 24 Jun 2026 12:47:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782305235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U2A4QuDgemvw1Sf+etVFj4hgRALEHALqTXi3Iy1ErUg=; b=AKRrXG8UrlyyL+cfOw3a1fK6heS/2UnGcW32yxOv/i+uCPNFezf5hxtdutu33K+m5oWVJc mCOV2Verxomjs2JadIQWoWFXXii17VOy4ABT5Ob+oC8dYtCRF+QIaK0yhio66VH+FstEEh RFWwOr//UbMCWXw1Dbdwb6FTSRqmnxg= X-MC-Unique: K3xmHSqMNyeshdYPz4O4CQ-1 X-Mimecast-MFC-AGG-ID: K3xmHSqMNyeshdYPz4O4CQ_1782305231 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 5/6] gitlab: pull before_script logic into .base_meson_job_template Date: Wed, 24 Jun 2026 13:46:56 +0100 Message-ID: <20260624124657.2725376-6-berrange@redhat.com> In-Reply-To: <20260624124657.2725376-1-berrange@redhat.com> References: <20260624124657.2725376-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 8 X-Spam_score: 0.8 X-Spam_bar: / X-Spam_report: (0.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1782305291249158500 This ensures that all jobs have the $JOBS env set and capture the packages.txt content (where available) in their logs, and all use the job section headers. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pierrick Bouvier --- .gitlab-ci.d/base.yml | 9 +++++++++ .gitlab-ci.d/buildtest-template.yml | 24 ++---------------------- .gitlab-ci.d/crossbuild-template.yml | 12 ------------ 3 files changed, 11 insertions(+), 34 deletions(-) diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index 6289c7e5c3..a75fb37d61 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -143,6 +143,15 @@ variables: - build/meson-logs reports: junit: build/meson-logs/*.junit.xml + before_script: + - source scripts/ci/gitlab-ci-section + - section_start setup "Pre-script setup" + - JOBS=3D$(expr $(nproc) + 1) + # Prevent logs (if any) from prior build job artifacts + # from being duplicated in the new job artifacts + - rm -f build/meson-logs/* + - test -f /packages.txt && cat /packages.txt + - section_end setup =20 .base_meson_ccache_job_template: extends: .base_meson_job_template diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index 8dfd17a0b5..11d7a75667 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -3,12 +3,6 @@ extends: .base_meson_ccache_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG - before_script: - - source scripts/ci/gitlab-ci-section - - section_start setup "Pre-script setup" - - JOBS=3D$(expr $(nproc) + 1) - - cat /packages.txt - - section_end setup script: - !reference [.base_meson_ccache_job_template, script] - du -sh .git @@ -74,11 +68,6 @@ =20 .native_test_job_template: extends: .common_test_job_template - before_script: - # Prevent logs from the build job that run earlier - # from being duplicated in the test job artifacts - - rm -f build/meson-logs/* - =20 .functional_test_job_template: extends: .common_test_job_template @@ -96,27 +85,18 @@ - build/tests/functional/*/*/*.log reports: junit: build/meson-logs/*.junit.xml - before_script: - - export QEMU_TEST_ALLOW_UNTRUSTED_CODE=3D1 - - export QEMU_TEST_CACHE_DIR=3D${CI_PROJECT_DIR}/functional-cache - # Prevent logs from the build job that run earlier - # from being duplicated in the test job artifacts - - rm -f build/meson-logs/* after_script: - cd build - du -chs ${CI_PROJECT_DIR}/*-cache variables: QEMU_JOB_FUNCTIONAL: 1 + QEMU_TEST_ALLOW_UNTRUSTED_CODE: 1 + QEMU_TEST_CACHE_DIR: ${CI_PROJECT_DIR}/functional-cache =20 .wasm_build_job_template: extends: .base_meson_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG - before_script: - - source scripts/ci/gitlab-ci-section - - section_start setup "Pre-script setup" - - JOBS=3D$(expr $(nproc) + 1) - - section_end setup script: - du -sh .git - mkdir build diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild= -template.yml index aadae26844..94423814a7 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -3,12 +3,6 @@ stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG timeout: 80m - before_script: - - source scripts/ci/gitlab-ci-section - - section_start setup "Pre-script setup" - - JOBS=3D$(expr $(nproc) + 1) - - cat /packages.txt - - section_end setup script: - !reference [.base_meson_ccache_job_template, script] - mkdir build @@ -48,9 +42,6 @@ stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG timeout: 60m - before_script: - - source scripts/ci/gitlab-ci-section - - JOBS=3D$(expr $(nproc) + 1) script: - !reference [.base_meson_ccache_job_template, script] - mkdir build @@ -73,9 +64,6 @@ extends: .base_meson_ccache_job_template stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:$QEMU_CI_CONTAINER_TAG - before_script: - - source scripts/ci/gitlab-ci-section - - JOBS=3D$(expr $(nproc) + 1) script: - !reference [.base_meson_ccache_job_template, script] - mkdir build --=20 2.54.0 From nobody Sun Jul 26 11:54:36 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1782305311; cv=none; d=zohomail.com; s=zohoarc; b=VW1+eHNQVSLgSG36ffciEAIDW0gq+7y8BbN4+yXQCE+JxoK040UXnM7v70EswZDdeQi6S5sbWg0hiVdSl9YZDBNxjoy/r1W8GY6U7cX2KosXzDI0/vGltxOaQK8Ve032cxotXsXKJRtFfj+nPq6i+Or2MerlOaIIrSjMwV34OSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782305311; 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=JGiI/E4m2CtgDflQah6Ez6vUFomHQjUX5W+C0IwbTsA=; b=iQRt6c0a6CVwPYnfT37nB4qDMhl6/cx1XBC/lv6vNJdQUPjOljhMwF7NtIbwKOm3hsk5c5tmhz0nHSl+DRgWzKHxP2ucN6KGI0cmpK2hQHJqjO8A8BSG860oLWaefRamZKcH17S+ADaMD8D5m3j1B3079ve+/COY/fB2zkqxciI= 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=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1782305311064274.13118919154135; Wed, 24 Jun 2026 05:48:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wcN1K-0005Xh-1r; Wed, 24 Jun 2026 08:47:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcN0i-0004pK-M2 for qemu-devel@nongnu.org; Wed, 24 Jun 2026 08:47:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wcN0h-0006Yj-6w for qemu-devel@nongnu.org; Wed, 24 Jun 2026 08:47:20 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-344-Ho0m6UwYPxmLZRGHBI5tAA-1; Wed, 24 Jun 2026 08:47:14 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 41B351801BDC; Wed, 24 Jun 2026 12:47:13 +0000 (UTC) Received: from berrange.com (unknown [10.44.49.57]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CB9D01956049; Wed, 24 Jun 2026 12:47:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782305237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JGiI/E4m2CtgDflQah6Ez6vUFomHQjUX5W+C0IwbTsA=; b=csWcMm7mG3Plb6rZJGL0iAzfLZbzeEv+9hzyAdzNlj+HvF0+YRgqgZpA3bUCctI6O3ZLTl mnIAH4gJAo7wEsrNGy1oTqGVyAqPp8jr8I8TCuDAMyy3JdM93jjSCAgzUBcLo1tRor4Fr5 Rd5nxNSSeRcNh/IkZTm9EIlgGY40OJw= X-MC-Unique: Ho0m6UwYPxmLZRGHBI5tAA-1 X-Mimecast-MFC-AGG-ID: Ho0m6UwYPxmLZRGHBI5tAA_1782305233 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Pierrick Bouvier , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 6/6] gitlab: greatly expand captured info about CI runner environment Date: Wed, 24 Jun 2026 13:46:57 +0100 Message-ID: <20260624124657.2725376-7-berrange@redhat.com> In-Reply-To: <20260624124657.2725376-1-berrange@redhat.com> References: <20260624124657.2725376-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1782305311329158501 To aid in debugging wierd CI failures we need greater information about the CI runner environment. It is usually container based and can have some unexpected characteristics that significantly differ from a developer's local environment. This captures the mount list, CPU model, memory information, device node lists, kernel info, user identity and all environment variables. Since this information can get quite large it is not emitted directly in the logs, rather it is exposed in job artifacts under the "ci-runner-env" directory. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Pierrick Bouvier --- .gitlab-ci.d/base.yml | 11 ++++++++++- .gitlab-ci.d/buildtest-template.yml | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/base.yml b/.gitlab-ci.d/base.yml index a75fb37d61..bec04138fa 100644 --- a/.gitlab-ci.d/base.yml +++ b/.gitlab-ci.d/base.yml @@ -141,6 +141,7 @@ variables: expire_in: 7 days paths: - build/meson-logs + - ci-runner-env reports: junit: build/meson-logs/*.junit.xml before_script: @@ -150,7 +151,15 @@ variables: # Prevent logs (if any) from prior build job artifacts # from being duplicated in the new job artifacts - rm -f build/meson-logs/* - - test -f /packages.txt && cat /packages.txt + - mkdir -p ci-runner-env + - test -f /packages.txt && cp /packages.txt ci-runner-env/packages.txt + - cp /proc/mounts ci-runner-env/mounts.txt + - cp /proc/cpuinfo ci-runner-env/cpuinfo.txt + - cp /proc/meminfo ci-runner-env/meminfo.txt + - ls -l /dev > ci-runner-env/devices.txt + - uname -a > ci-runner-env/kernel.txt + - id -a > ci-runner-env/user.txt + - printenv | sort > ci-runner-env/environ.txt - section_end setup =20 .base_meson_ccache_job_template: diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index 11d7a75667..e62b3f2123 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -38,6 +38,7 @@ paths: - build - .git-submodule-status + - ci-runner-env exclude: - build/**/*.p - build/**/*.a.p @@ -83,6 +84,7 @@ paths: - build/meson-logs - build/tests/functional/*/*/*.log + - ci-runner-env reports: junit: build/meson-logs/*.junit.xml after_script: --=20 2.54.0