From nobody Sat Feb 7 07:11:48 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=1769524126; cv=none; d=zohomail.com; s=zohoarc; b=hWGZDqfxfGcWFPao5bXry645WYJtY6GSXu/kuXHRTNxl1RB5cFm5uZEWhpBc+yxou42FmjUUIHL8zOBZzQH6HxnyR4aWTSaruvyFkNsV5Xx2FDWaOlLvwQPf/8CirTI1rD9C/eFYXhkqJBGIHWd+JkJREyHFQcWcUF8lVY8D3Bk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769524126; 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=7tbZk7kKvr/QHmajzAyPefU5UXlH0HA6YDOdEBNq1qA=; b=Zqhive9YFFUgCCDKBWc14YFYNWx9PKNaPHeaSSRWAzE/nWBo1cIgewnKSmNtWncVYouDV2mtPnyD+EyvEJLlZOC1LQp8Y5hgrc6hXhZiE2xAmnBG9HAP7JrLv2Rm0sH0RiJzDMLN0mv8vzpXtb8yj66jMofrRKRrPeL2koN8eFA= 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 1769524126127485.4918040293592; Tue, 27 Jan 2026 06:28:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vkk2W-0006CI-H5; Tue, 27 Jan 2026 09:27:32 -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 1vkk2P-0006Ad-NS for qemu-devel@nongnu.org; Tue, 27 Jan 2026 09:27:25 -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 1vkk2M-0003ab-BU for qemu-devel@nongnu.org; Tue, 27 Jan 2026 09:27:24 -0500 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-327-d9jj_lo_MzurQ4QRibKLqQ-1; Tue, 27 Jan 2026 09:27:18 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D27211800350; Tue, 27 Jan 2026 14:27:16 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.209]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4B9E618001D5; Tue, 27 Jan 2026 14:27:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1769524041; 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=7tbZk7kKvr/QHmajzAyPefU5UXlH0HA6YDOdEBNq1qA=; b=Hf99dxwMRNUfXbIsy7knqC2af7p1pT3mRilFb/jtMY75O8DQS6qmMjol2rfSf7aJ9bRX0p 7gkULdnaSrcZ5SfzRABFaEEfa58KPOp+lgQfpoGlgc9/Q3RckB/vxW5Y9zRLT7ie6gDdA+ z+5C59b2nywdbBOhcg0NqcmmlS23ksM= X-MC-Unique: d9jj_lo_MzurQ4QRibKLqQ-1 X-Mimecast-MFC-AGG-ID: d9jj_lo_MzurQ4QRibKLqQ_1769524037 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Michael Tokarev Subject: [PULL 1/9] gitlab: preserve base rules for container template Date: Tue, 27 Jan 2026 15:27:02 +0100 Message-ID: <20260127142710.131904-2-thuth@redhat.com> In-Reply-To: <20260127142710.131904-1-thuth@redhat.com> References: <20260127142710.131904-1-thuth@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 client-ip=170.10.129.124; envelope-from=thuth@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.001, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 1769524128850158500 From: Daniel P. Berrang=C3=A9 When extending the container template to allow scheduled pipelines 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 Fixes: 8bec7b987423 ("gitlab: add a weekly container building job") Message-ID: <20260119135528.2738108-1-berrange@redhat.com> Signed-off-by: Thomas Huth --- .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 b92e96b0fc5..6eaa2f804df 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