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=-13.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 D404AC433E0 for ; Mon, 29 Jun 2020 09:57:02 +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 9C78D2376F for ; Mon, 29 Jun 2020 09:57:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Qtu6uzTJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C78D2376F 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]:50004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jpqX7-0002BS-TW for qemu-devel@archiver.kernel.org; Mon, 29 Jun 2020 05:57:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jpqV6-00086b-VR for qemu-devel@nongnu.org; Mon, 29 Jun 2020 05:54:56 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:50705 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jpqV5-0003Dh-0Z for qemu-devel@nongnu.org; Mon, 29 Jun 2020 05:54:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593424494; 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=nLit/mMPcOKSqbc2b/YbbDwaKlORovevbjvJGDXb1L8=; b=Qtu6uzTJFIzL4N+tIl6PlONdu+IwYsUcwU4Ywq4Iijw+XaznN/KOzYzFhs47XWbBqkz2cO 6Odm+SjN1kzfMitqsSi2TtfkU2CJF9JbyJrGPqxakydMLohI0jiGd3eLgl9iOhN7x6oC5l tMY/5ua4WFTFMEC6IN6rvo3jnAo9eGQ= 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-257-WOfdp6YFNzyWt9vWwpWpSA-1; Mon, 29 Jun 2020 05:54:51 -0400 X-MC-Unique: WOfdp6YFNzyWt9vWwpWpSA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CCC8D800C64; Mon, 29 Jun 2020 09:54:48 +0000 (UTC) Received: from thuth.remote.csb (ovpn-112-140.ams2.redhat.com [10.36.112.140]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9EC3571667; Mon, 29 Jun 2020 09:54:42 +0000 (UTC) Subject: Re: [PATCH v3 19/30] gitlab: build all container images during CI To: =?UTF-8?Q?Alex_Benn=c3=a9e?= , qemu-devel@nongnu.org References: <20200626181357.26211-1-alex.bennee@linaro.org> <20200626181357.26211-20-alex.bennee@linaro.org> From: Thomas Huth Message-ID: <2f2d3037-1e1b-7993-4fb2-61022f9f9d51@redhat.com> Date: Mon, 29 Jun 2020 11:54:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20200626181357.26211-20-alex.bennee@linaro.org> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=207.211.31.81; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/29 01:03:51 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: fam@euphon.net, berrange@redhat.com, richard.henderson@linaro.org, f4bug@amsat.org, Wainer dos Santos Moschetta , cota@braap.org, =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 26/06/2020 20.13, Alex Bennée wrote: > From: Daniel P. Berrangé > > We have a number of container images in tests/docker/dockerfiles > that are intended to provide well defined environments for doing > test builds. We want our CI system to use these containers too. > > This introduces builds of all of them as the first stage in the > CI, so that the built containers are available for later build > jobs. The containers are setup to use the GitLab container > registry as the cache, so we only pay the penalty of the full > build when the dockerfiles change. The main qemu-project/qemu > repo is used as a second cache, so that users forking QEMU will > see a fast turnaround time on their CI jobs. > > Signed-off-by: Daniel P. Berrangé > Message-Id: <20200622153318.751107-3-berrange@redhat.com> > [AJB: tweak the tag format] > Signed-off-by: Alex Bennée > Acked-by: Thomas Huth > --- > .gitlab-ci.d/containers.yml | 248 ++++++++++++++++++++++++++++++++++++ > .gitlab-ci.yml | 3 + > 2 files changed, 251 insertions(+) > create mode 100644 .gitlab-ci.d/containers.yml > > diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml > new file mode 100644 > index 00000000000..580439647ef > --- /dev/null > +++ b/.gitlab-ci.d/containers.yml > @@ -0,0 +1,248 @@ > + > + Remove one or two empty lines here? > +.container_job_template: &container_job_definition > + image: docker:stable > + stage: containers > + services: > + - docker:dind > + before_script: > + - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" > + - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/$NAME:latest" > + - docker info > + - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" > + script: > + - docker pull "$TAG" || docker pull "$COMMON_TAG" || true > + - sed -i -e "s,FROM qemu/,FROM $CI_REGISTRY_IMAGE/qemu/," tests/docker/dockerfiles/$NAME.docker > + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "tests/docker/dockerfiles/$NAME.docker" tests/docker/dockerfiles > + - docker push "$TAG" > + after_script: > + - docker logout [...] > + > +amd64-ubuntu-container: > + <<: *container_job_definition > + variables: > + NAME: ubuntu > + "git am" complains: Applying: gitlab: build all container images during CI .git/rebase-apply/patch:260: new blank line at EOF. + ... thus remove the trailing empty line? Thomas