From patchwork Wed Oct 27 05:26:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12586433 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 041B3C433FE for ; Wed, 27 Oct 2021 05:29:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 95B29604DA for ; Wed, 27 Oct 2021 05:29:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 95B29604DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:48416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfbUn-0004qb-J3 for qemu-devel@archiver.kernel.org; Wed, 27 Oct 2021 01:29:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfbSw-0002ie-4V for qemu-devel@nongnu.org; Wed, 27 Oct 2021 01:27:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:55710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfbSu-0006s7-Ae for qemu-devel@nongnu.org; Wed, 27 Oct 2021 01:27:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635312427; 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=nhkz4fhSYwpACOwd0W4U78Tq1lX+yesCuM2UP3c4jwk=; b=D6r3HS0ktgI4I5m4p7tBiHCNfWnlKY8slP2HVeigc9o6fnmOksuM+N/MN4UrV5Ds0KoGtb p447tqvwAi3TxAjWqaFS1vc+k8arQ1nOGpEYNYMmKUU5qPjiSI911YsPBuixhF030Lsy4x eoFYgGggqA3Eh5b+MLsvovA8uWXNiss= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-158-s2kN_DQ9OPCKm_5rWxs9Ug-1; Wed, 27 Oct 2021 01:27:04 -0400 X-MC-Unique: s2kN_DQ9OPCKm_5rWxs9Ug-1 Received: by mail-wm1-f69.google.com with SMTP id b81-20020a1c8054000000b0032c9d428b7fso738026wmd.3 for ; Tue, 26 Oct 2021 22:27:04 -0700 (PDT) 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=nhkz4fhSYwpACOwd0W4U78Tq1lX+yesCuM2UP3c4jwk=; b=WIDdDXvlP0IBZ45dI9p1oT2ciMkpnx7u/LOmIPqXSG51uSEzak4GErPfT52RI7rlSF Tdwdj9TnsnLsoVdFnpTpHxPBgf/x+Rifi9Bi8yOyOp777lYJH5LMLpjtQJzgth+IK8Ek Fr0xgAPEkPg7yOzuF5j8LUuezUGQmhg14xXouL0IeLv7wSjsRTAOzi4rEvcw1Huv+hn4 bmKO67HeKqCOywb1k1ZA+qcsqNMP7ry4l65QV6+Lj99mX2IDnzX710aYQZ21q0Ig0pXn jR9xtTxXVUcCSw4wyW1TX/ZDIl2hNqXE4+JsWHXDolo9UDQAim9DzUI/ejnUzsBj35vI ZhPg== X-Gm-Message-State: AOAM530PJiYlnz8Y67hxVim17DUAnUUYs3EDhGDLxsiB82TbhzzueX9Q GxTVSu+HQtXBstZHMzVevrepBXDoDz04uXDMf8Ab4oyVEHaBKPmVmrEV1Lm1wEITzVIoHlsDjiE 8tqxB1vo9jQr3ZqYhWh+zAypjZQ0JdKqE/0Xsn+0fOQZ64b1yjI5RENpMGxnrrtF3 X-Received: by 2002:a05:600c:255:: with SMTP id 21mr3578308wmj.54.1635312423025; Tue, 26 Oct 2021 22:27:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYouRo95jaHSafAznfs31z7vFbfFJVA2j70VDMYNUNRZN0TqaPJK4xf8+PwcPpBm4PnYbXaA== X-Received: by 2002:a05:600c:255:: with SMTP id 21mr3578275wmj.54.1635312422675; Tue, 26 Oct 2021 22:27:02 -0700 (PDT) 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 b7sm1778585wrv.72.2021.10.26.22.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 22:27:02 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-6.0.1 1/2] gitlab: only let pages be published from default branch Date: Wed, 27 Oct 2021 07:26:55 +0200 Message-Id: <20211027052656.1275436-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211027052656.1275436-1-philmd@redhat.com> References: <20211027052656.1275436-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 Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé GitLab will happily publish pages generated by the latest CI pipeline from any branch: https://docs.gitlab.com/ee/user/project/pages/introduction.html "Remember that GitLab Pages are by default branch/tag agnostic and their deployment relies solely on what you specify in .gitlab-ci.yml. You can limit the pages job with the only parameter, whenever a new commit is pushed to a branch used specifically for your pages." The current "pages" job is not limited, so it is happily publishing docs content from any branch/tag in qemu.git that gets pushed to. This means we're potentially publishing from the "staging" branch or worse from outdated "stable-NNN" branches This change restricts it to only publish from the default branch in the main repository. For contributor forks, however, we allow it to publish from any branch, since users will have arbitrarily named topic branches in flight at any time. Signed-off-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210723113051.2792799-1-berrange@redhat.com> Signed-off-by: Paolo Bonzini (cherry picked from commit eafadbbbac06a8d72baa976f4d3c42b0e5f8cfc8) Signed-off-by: Philippe Mathieu-Daudé --- .gitlab-ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52d65d6c04f..f8cc67baad9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -817,6 +817,17 @@ build-tools-and-docs-debian: # Prepare for GitLab pages deployment. Anything copied into the # "public" directory will be deployed to $USER.gitlab.io/$PROJECT +# +# GitLab publishes from any branch that triggers a CI pipeline +# +# For the main repo we don't want to publish from 'staging' +# since that content may not be pushed, nor do we wish to +# publish from 'stable-NNN' branches as that content is outdated. +# Thus we restrict to just the default branch +# +# For contributor forks we want to publish from any repo so +# that users can see the results of their commits, regardless +# of what topic branch they're currently using pages: image: $CI_REGISTRY_IMAGE/qemu/debian-amd64:latest stage: test @@ -835,3 +846,10 @@ pages: artifacts: paths: - public + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + when: on_success + - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' + when: never + - if: '$CI_PROJECT_NAMESPACE != "qemu-project"' + when: on_success From patchwork Wed Oct 27 05:26:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12586431 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49DA2C433F5 for ; Wed, 27 Oct 2021 05:29:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CC97A604DA for ; Wed, 27 Oct 2021 05:29:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CC97A604DA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:48260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfbUm-0004kR-Vn for qemu-devel@archiver.kernel.org; Wed, 27 Oct 2021 01:29:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfbSy-0002jH-Hn for qemu-devel@nongnu.org; Wed, 27 Oct 2021 01:27:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:24352) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfbSw-0006sT-VL for qemu-devel@nongnu.org; Wed, 27 Oct 2021 01:27:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635312430; 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=Ob7HO+s04bW/k1ZAoKBdlVAzbc1RbPyfObX22rOHPy8=; b=Ffftc2akh2grCvE8AmkGBuGghtM+orq05NBTxlGzQ4jqVQUWAAxEaLO7Y5pxbKKQUJgyqD 7z2xvCK1gnD5LaJdEctZXLax1s8HNLn3MqKx+xkYbKBOItaBOZfWU8iLbQgl4iWmsrE42j wxh0xtVks4F2wQkWluD/JiNICWH1Nr4= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-61-ktKskA4rOiWI5sdc7zYjNA-1; Wed, 27 Oct 2021 01:27:08 -0400 X-MC-Unique: ktKskA4rOiWI5sdc7zYjNA-1 Received: by mail-wr1-f70.google.com with SMTP id f18-20020a5d58f2000000b001645b92c65bso268697wrd.6 for ; Tue, 26 Oct 2021 22:27:08 -0700 (PDT) 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=Ob7HO+s04bW/k1ZAoKBdlVAzbc1RbPyfObX22rOHPy8=; b=8I/wwEq4IBxGd2B3txSVBJ4hwnLiOqDg/u6zpsvSbJiY/n2Vw0WFbj9U0graoSaG+q PFRJr8FPZTL976Bz1+vb6z+AkQV3AXnqnwjuu+3JzD3vEK5JofTnIMyW57/Lxejdg8sj 33PTWeQ3OQocED53dC6mEKG39rPO6wyf5VvQRS3wdlIr2Q/DoQnE6vm7dBqypvrcM0Ap pF+BzATHVgNseR7BUnl0vxwQSAOI5e1KatJnm2oPtDL2DJuXb+1zHmviuNTDJ8Teifz+ Y5NTTwdc1bK/cl3gVwQAO3M1h0aMkJHDOVE/pxUHFG1ycz1y5CqFkNIWsgEgobwrp757 vydw== X-Gm-Message-State: AOAM532CgW0sbFHVRoyBsc3OzyJuuzdI/+v91PR474UiEexevvhcLLqC 56RJk9oRFTqp+pbe4flCfpbFRF0xqO+nd9NrtBPAOc13iV9EzsfO5dzSTx6KYB2/hST+R0V0fqC SZD0UX2vltolZR8rIJbDyqRSbdNQEUmfmSLh+jZQp8xhg51hilkZFBKKCLyfKbdV8 X-Received: by 2002:a7b:c207:: with SMTP id x7mr3397507wmi.116.1635312427404; Tue, 26 Oct 2021 22:27:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgcjGd1RdVkLJe3mhQNFGAMYb/mkQq/ieercwZcisdnwnKsoyhOII96kfmdH7b2+Du6+z7IQ== X-Received: by 2002:a7b:c207:: with SMTP id x7mr3397481wmi.116.1635312427129; Tue, 26 Oct 2021 22:27:07 -0700 (PDT) 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 l11sm5574127wrt.49.2021.10.26.22.27.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 22:27:06 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-6.0.1 2/2] gitlab-ci: Only push docker images to registry from /master branch Date: Wed, 27 Oct 2021 07:26:56 +0200 Message-Id: <20211027052656.1275436-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211027052656.1275436-1-philmd@redhat.com> References: <20211027052656.1275436-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 Received-SPF: pass client-ip=170.10.129.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Willian Rampazzo , Michael Roth , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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. Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20211026145509.1029274-1-philmd@redhat.com> --- .gitlab-ci.d/containers.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/containers.yml b/.gitlab-ci.d/containers.yml index 33e4046e233..57928e4fb11 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -17,7 +17,16 @@ -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" -r $CI_REGISTRY_IMAGE - 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" = "qemu-project" && + test -n "$CI_COMMIT_TAG" + -o "$CI_COMMIT_BRANCH" != "$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 ba7280605c4..b165cc95214 100644 --- a/.gitlab-ci.d/edk2.yml +++ b/.gitlab-ci.d/edk2.yml @@ -21,7 +21,16 @@ docker-edk2: - docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_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" = "qemu-project" && + test -n "$CI_COMMIT_TAG" + -o "$CI_COMMIT_BRANCH" != "$CI_DEFAULT_BRANCH"; + then + :; + else + docker push "$IMAGE_TAG"; + fi build-edk2: stage: build diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index f66cd1d9089..908540daaf7 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -21,7 +21,16 @@ docker-opensbi: - docker build --cache-from $IMAGE_TAG --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $IMAGE_TAG .gitlab-ci.d/opensbi - 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" = "qemu-project" && + test -n "$CI_COMMIT_TAG" + -o "$CI_COMMIT_BRANCH" != "$CI_DEFAULT_BRANCH"; + then + :; + else + docker push "$IMAGE_TAG"; + fi build-opensbi: stage: build