From nobody Sat Feb 7 08:53:23 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=1768831002; cv=none; d=zohomail.com; s=zohoarc; b=cUiqlQoeK/YIMrdhDq/F/wb+rvVpeb0UlvJ39CwkLjDIQkIJbNUQuKHHDYACAAno7ApGB+O6j0KemP/VwDh8ldPSCr/p6fF+ZRhBWNTcgANUfmmXEJ7jg6z3OAeqzLFFeSySomxZCluZSCh6stjCtCK7FK295twGrlCk9XRkc44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768831002; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9hRLX00Vpi4/rICUPIFLXB8cIyUCLmdo/5ijVLTOKns=; b=SvseYXT+YHozXGxlQkKwDsH84FCVIedwaaYBMUBywgLw/oox3rYoAIKXvksixsBQmX3tI5iEx+BC5ZmV5poZ4iUuaS2X049E2M98EOkxPgT7WLG2U5k/5Pj7u9Mm/H5NahmS+qph6v8fwNfxVUl0EUY7/8NtiJEtKeL/GsTQbdk= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768831002001903.9515670076449; Mon, 19 Jan 2026 05:56:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vhpjN-0007IV-0p; Mon, 19 Jan 2026 08:55:45 -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 1vhpjL-0007Gm-VT for qemu-devel@nongnu.org; Mon, 19 Jan 2026 08:55:44 -0500 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 1vhpjK-0004TJ-8S for qemu-devel@nongnu.org; Mon, 19 Jan 2026 08:55:43 -0500 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-63--l0Fxj77MOS6WaOfWudqDg-1; Mon, 19 Jan 2026 08:55:35 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 2F9181954B0B; Mon, 19 Jan 2026 13:55:34 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.53]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9F1FD18001D5; Mon, 19 Jan 2026 13:55:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768830939; 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; bh=9hRLX00Vpi4/rICUPIFLXB8cIyUCLmdo/5ijVLTOKns=; b=Iwq1DipGp/vRaguve5/wl807VKhfs1XLfVQDp4XPMNL7Gq21zuzJjgarf1lA/twvljAKFB eAgjAcXBCXgfcLFIo0NEH0VHSCjKgiGwsP6GdglMrQ0tOV91oLa3KZer6lKbXS5yhZ52eV YTNJBaTyY8EKoFePW8duwUq14c4WUfI= X-MC-Unique: -l0Fxj77MOS6WaOfWudqDg-1 X-Mimecast-MFC-AGG-ID: -l0Fxj77MOS6WaOfWudqDg_1768830934 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Michael Tokarev , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH] gitlab: preserve base rules for container template Date: Mon, 19 Jan 2026 13:55:28 +0000 Message-ID: <20260119135528.2738108-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.4.1 on 10.30.177.111 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 (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=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.016, 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_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: 1768831004460154100 When extending the container template to allow scheduled piplines in upstream context, we must ensure that all the existing rules defined by .base_job_template are preserved. Fortunately since the new rule for scheduled pipelines can come at the head of all other rules, not in the middle, we can just the obscure '!reference' syntax to pull in all the pre-existing rules as a single block. This fixes * stable branches using the wrong tag name in container images * pushes to forks unconditionally running container builds Fixes: 8bec7b9874235e60f14172618121c60fdbd39302 Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Michael Tokarev --- .gitlab-ci.d/container-template.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-t= emplate.yml index b92e96b0fc..6eaa2f804d 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -23,6 +23,5 @@ - docker logout rules: # because we want to enable this for scheduled runs we also have to re= plicate the normal rules - - if: '$CI_PIPELINE_SOURCE =3D=3D "schedule"' - - if: '$CI_PROJECT_NAMESPACE =3D=3D $QEMU_CI_UPSTREAM && $CI_COMMIT_BR= ANCH =3D~ /^staging/' - - if: '$QEMU_CI && $CI_PROJECT_NAMESPACE !=3D $QEMU_CI_UPSTREAM' + - if: '$CI_PIPELINE_SOURCE =3D=3D "schedule" && $CI_PROJECT_NAMESPACE = =3D=3D $QEMU_CI_UPSTREAM' + - !reference [.base_job_template, rules] --=20 2.52.0