From nobody Mon Feb 9 01:01:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635260122; cv=none; d=zohomail.com; s=zohoarc; b=BTg39UnfzS/Uo5Ce4oweuXM2FfE1tdFM2X6L3TfE7oaxC9WCGI1abKwRpCdfBV97WfUGDMIVCT5MEyuwAGMz6fGo/qgfxHOTC+6uH82Zz/PiJM6e+F9/pqCZBoMNHCTy2LPN1ferXZEY0ib49QPT+/imRuq9cuxm23gwFScrBqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635260122; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=HydchOjaPM6cp7iyVMRMimgnp2tQrCLOoHuc2pcUzOQ=; b=KG4nq9G4NERy5n8bFd0u8XeNszM8WyntIE0i0qpTGGItLLiH7tdcyubyBj62IhTxCsYHuJysZ9HesWMZoJB/qHuAky+rHpM5JaOh17SpLLRnsAK78F9LZBDhYHlwK5UjTUDk/RmqzXeKV5qp0EGZzyJp0PoVLnqtq+NVZhtpOic= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1635260122287495.22055071572333; Tue, 26 Oct 2021 07:55:22 -0700 (PDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-208-ASpZcgPnP5K8CzROOsb0zg-1; Tue, 26 Oct 2021 10:55:18 -0400 Received: by mail-wm1-f70.google.com with SMTP id v10-20020a1cf70a000000b00318203a6bd1so1042770wmh.6 for ; Tue, 26 Oct 2021 07:55:17 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id p3sm18868712wrs.10.2021.10.26.07.55.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 07:55:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635260121; 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=HydchOjaPM6cp7iyVMRMimgnp2tQrCLOoHuc2pcUzOQ=; b=hCy4EciToQDv3UFWZ7v2jvoJ5m6FyuJhHY0o4TJhaWdw3O1/RbWuVWHd7g/foOra58yZIo jH7rUc4sZSP7CTC8pEwLC9f9e9LsiME/XEBpWPx+AGdRCh6RSZEqkwrsQYoquWNd+aRPus P7850khiFTckBilmUISjcVBIdnSombw= X-MC-Unique: ASpZcgPnP5K8CzROOsb0zg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HydchOjaPM6cp7iyVMRMimgnp2tQrCLOoHuc2pcUzOQ=; b=kqqUvUnAflsODSEhoCcvqQaXsnm8oiMCyRrPu3DO7UCjyvVk7QOoiakkhLB/g08mj8 RPjdY0VPKh7NLpNfjCFH0Vk21Bbb/OfiMVBLQQnbOLsBhTPpqH13DDBVEsbduBCFfTk2 qauKLs7dXidjI8JiFIPTlNLiclQZ8R5uMriN92zO5uz8UwhkK1KIcCEGz++HZR5WKolT UF6oPkXWLK/FV9AvR6JyqZdCbDZfuhMw/g5olmSw9fhGdjsbWbI9t/6fx/g26/xXh3Hu BkSCaLL+goSehrlyC6PUF3hKBnbVkBG4eL/TCc4ZIKovo91JDFmlhn3z29FJOWzRn2cS I7pg== X-Gm-Message-State: AOAM5333biGjOVNdK6K3mmmPd1IiVzxOOWWBO449411hMBfgHlnUalIz tF0vCrefMIVp2jlwKAN4QXKpAugAPCW014eMlPorPoHf6QAT7hVQjuOrhti8kGVi1QY7+dv23nb Kj5gIogfwSDHizg== X-Received: by 2002:a5d:5274:: with SMTP id l20mr5643569wrc.328.1635260116744; Tue, 26 Oct 2021 07:55:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4TclYkT0qtiTo6bxjxD6df5LtmaJwld8Gnua3VCtZRWcXFHHVb9AKOSh5ZOMsY48aVEPT+A== X-Received: by 2002:a5d:5274:: with SMTP id l20mr5643539wrc.328.1635260116571; Tue, 26 Oct 2021 07:55:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Bin Meng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Willian Rampazzo , Stefan Hajnoczi , Wainer dos Santos Moschetta , Peter Maydell , Thomas Huth , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/1] gitlab-ci: Only push docker images to registry from /master branch Date: Tue, 26 Oct 2021 16:55:09 +0200 Message-Id: <20211026145509.1029274-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211026145509.1029274-1-philmd@redhat.com> References: <20211026145509.1029274-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635260122604100001 Users expect images pulled from registry.gitlab.com/qemu-project/qemu/ to be stable. QEMU repository workflow pushes merge candidates to the /staging branch, and on success the same commit is pushed as /master. If /staging fails, we do not want to push the built images to the registry. Therefore limit the 'docker push' command to the /master branch on the mainstream CI. The fork behavior is unchanged. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/container-template.yml | 11 ++++++++++- .gitlab-ci.d/edk2.yml | 11 ++++++++++- .gitlab-ci.d/opensbi.yml | 11 ++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-t= emplate.yml index 1baecd94606..0a736644b22 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -16,6 +16,15 @@ -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" -r $CI_REGISTRY/qemu-project/qemu - docker tag "qemu/$NAME" "$TAG" - - docker push "$TAG" + # On mainstream CI, we only want to push images on the master branch, + # so skip the other cases (tag or non-master branch). + - if test "$CI_PROJECT_NAMESPACE" =3D "qemu-project" && + test -n "$CI_COMMIT_TAG" + -o "$CI_COMMIT_BRANCH" !=3D "$CI_DEFAULT_BRANCH"; + then + :; + else + docker push "$TAG"; + fi after_script: - docker logout diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml index 13d0f8b019f..e15f80f4874 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -33,7 +33,16 @@ docker-edk2: - docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMI= T_SHA --tag $IMAGE_TAG .gitlab-ci.d/edk2 - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - - docker push $IMAGE_TAG + # On mainstream CI, we only want to push images on the master branch, + # so skip the other cases (tag or non-master branch). + - if test "$CI_PROJECT_NAMESPACE" =3D "qemu-project" && + test -n "$CI_COMMIT_TAG" + -o "$CI_COMMIT_BRANCH" !=3D "$CI_DEFAULT_BRANCH"; + then + :; + else + docker push "$IMAGE_TAG"; + fi =20 build-edk2: extends: .edk2_job_rules diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 5e0a2477c5d..a38ccbe5baa 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -34,7 +34,16 @@ docker-opensbi: - docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMI= T_SHA --tag $IMAGE_TAG .gitlab-ci.d/open= sbi - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - - docker push $IMAGE_TAG + # On mainstream CI, we only want to push images on the master branch, + # so skip the other cases (tag or non-master branch). + - if test "$CI_PROJECT_NAMESPACE" =3D "qemu-project" && + test -n "$CI_COMMIT_TAG" + -o "$CI_COMMIT_BRANCH" !=3D "$CI_DEFAULT_BRANCH"; + then + :; + else + docker push "$IMAGE_TAG"; + fi =20 build-opensbi: extends: .opensbi_job_rules --=20 2.31.1