From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44A0FC433E0 for ; Tue, 16 Feb 2021 09:54:12 +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 9FBEB64DDA for ; Tue, 16 Feb 2021 09:54:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FBEB64DDA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBx3a-0002zg-Iw for qemu-devel@archiver.kernel.org; Tue, 16 Feb 2021 04:54:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBx2Q-0002Ym-5N for qemu-devel@nongnu.org; Tue, 16 Feb 2021 04:52:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lBx2O-00072J-DK for qemu-devel@nongnu.org; Tue, 16 Feb 2021 04:52:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613469175; h=from:from:reply-to: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=SRReZNgCWzUmpfIFFGfMkJs+6acHmwwCq7vHjR8sy18=; b=TB1pHU47G5l/twvsjjvqvPsLImSWV+2Zl35pQgZGeYqlr6KKhfpryUGSLfcLocWy/Yv2mz B67BnJ+PZzA4YGY2YQ9GUu21LwCYBBpgFgLvHYCVfHwiQNtrB2Qyh9zUeJSKwOWeZ5J9A7 jiE5dNSsoENQaWR8bnMQFt+OVWACj8s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-562-r1Uaw6TqMR20R3ZYVh9iXw-1; Tue, 16 Feb 2021 04:52:52 -0500 X-MC-Unique: r1Uaw6TqMR20R3ZYVh9iXw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9C08AC283; Tue, 16 Feb 2021 09:52:51 +0000 (UTC) Received: from redhat.com (ovpn-112-215.ams2.redhat.com [10.36.112.215]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A5912B0AA; Tue, 16 Feb 2021 09:52:46 +0000 (UTC) Date: Tue, 16 Feb 2021 09:52:43 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: Re: [PATCH] gitlab-ci: Only push Docker 'latest' image when building default branch Message-ID: References: <20210215192814.989441-1-philmd@redhat.com> <97878d0a-5c47-c50c-c4ef-f6d69a52a7d0@redhat.com> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/2.0.5 (2021-01-21) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=berrange@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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Richard Henderson , Thomas Huth , Alex =?utf-8?Q?Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Feb 16, 2021 at 08:05:09AM +0100, Philippe Mathieu-Daudé wrote: > On 2/16/21 7:55 AM, Thomas Huth wrote: > > On 15/02/2021 20.28, Philippe Mathieu-Daudé wrote: > >> While we are interested in building docker images in different > >> branches, it only makes sense to push 'latest' to the registry > >> when this is the project default branch (usually 'master'). > >> > >> Else when pushing different branches concurrently we might have > >> inconsistent image state between branches. > >> > >> Signed-off-by: Philippe Mathieu-Daudé > >> --- > >>   .gitlab-ci.d/containers.yml | 2 +- > >>   1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml > >> index 90fac85ce46..52a915f4141 100644 > >> --- a/.gitlab-ci.d/containers.yml > >> +++ b/.gitlab-ci.d/containers.yml > >> @@ -17,7 +17,7 @@ > >>             -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" > >>             -r $CI_REGISTRY_IMAGE > >>       - docker tag "qemu/$NAME" "$TAG" > >> -    - docker push "$TAG" > >> +    - test "$CI_COMMIT_BRANCH" = "$CI_DEFAULT_BRANCH" && docker push > >> "$TAG" > > > > So does that mean that the following stages in the CI (i.e. build, test) > > are only always (i.e. also for the non-master branches) going to use > > containers that have been build on the master branch? > > Hmm good point. Should we use "$CI_COMMIT_BRANCH" instead of "latest"? This doesn't work because git branch names are not guaranteed to be valid docker tag names. Please see my thread here: https://lists.gnu.org/archive/html/qemu-devel/2021-02/msg03535.html Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|