From patchwork Fri Jun 26 18:13:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 191901 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp651719ecs; Fri, 26 Jun 2020 11:24:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyaWqQOjIs/xVEgBX2r1jjGf1xf8kpDKIiI2sFwdpObWrmLYq4Zl99Fls45K2fHBceYi6pX X-Received: by 2002:a25:c683:: with SMTP id k125mr7608974ybf.305.1593195881959; Fri, 26 Jun 2020 11:24:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593195881; cv=none; d=google.com; s=arc-20160816; b=C/h78mglo9ofMwl6ig/iS761p60TboGGL97Xe3uqxaAT1NB6t+k3KkmcwD0MvbEH7M wJfw6+DkZWHputA9ry5v67LeNBKo1QVFXOpSyQgWUQxZbIkdeC2hvTKKga96qp4VFIG9 U5YXOoni/a1QbM/uGfTs51d8fct+DNc8cGvbsrbM9HUKzextDAsmjEOKWh0o9eIcgmuj m9zU6qzQz+UnSyi1rAooqKocw0lkxhyeVYg+QfOp8vDAWArl8O5ixIbQwh3qty+DNqaS hA3D3GAgy5meMi+dgMmz/WsfdEB9iHlPYGQLVkpjr0fExlPCBD1WwK4KzooS4JSMCePD 4AeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=eb5iaPGhoDcsV6Aa17DQE5OucQ4Fpz4RuFDlJP0p52E=; b=nmu3Ldv8w1rRb5wUPqaEsPUTduOd156BRNKHZdhpQlluFo84y+N+owWFb8Ptpx6QCz S9NEhfpYsvdhANxjzBMohq4724TsSdmOSg30vqDP7OzyvZdwiT21tSbu34oRpzd/dr1M 57oGI2r9/rUve7RsnoC5O29BvcoOsgwWe4+cK44Z+FmRdf73kvD7DXTp/JT8786wi1Cv np8EJ44DlNIhqXQBr1Nj67c989FM9oqeLdBhKMXWx+fPt921uaJt8zOQI00lZhoZIa34 C2THPVHnDBAdNgBAUVvByJObg00KysogbNDBVYPLCZgjYgrOxoFDQ/bgx8KnyblQRhC9 VyIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uNC4KkaH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 194si24236330ybn.352.2020.06.26.11.24.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jun 2020 11:24:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uNC4KkaH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jot1l-0005sl-Bs for patch@linaro.org; Fri, 26 Jun 2020 14:24:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jot04-0003O0-Qv for qemu-devel@nongnu.org; Fri, 26 Jun 2020 14:22:56 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:38720) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jot02-0004zb-H8 for qemu-devel@nongnu.org; Fri, 26 Jun 2020 14:22:56 -0400 Received: by mail-wm1-x341.google.com with SMTP id f18so10241811wml.3 for ; Fri, 26 Jun 2020 11:22:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eb5iaPGhoDcsV6Aa17DQE5OucQ4Fpz4RuFDlJP0p52E=; b=uNC4KkaHxCWcXRRXRdQ9md/cOiYDqzKBxBQNnFLTeKoBa5AaGNATDMbxaetRG7ctEW 8r0MusUUcJm2mElNpRnqf6x0vSlMHa6f2JqNdbX7YAtw7YU6U7RPAZfPfCdryQHKBf4B gnUGLRSNim48zPvSkBovrGvpHo/z7ndYzGIASCg+2XPp459GrMuB59rBK6t7g8D6SPIJ qDQYx0P6sKVzkyYszmygKnIPhCOL7AM+0X12wyjDai3rOwkslZLd7oEvdoZyQHr4CIsE tTIyb/re3tsl1sNi+rbHNeBs+CRLsOTDD76gqW3AqdvAfWYpSpNbDZxJyjDioX3VtQV9 xZYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eb5iaPGhoDcsV6Aa17DQE5OucQ4Fpz4RuFDlJP0p52E=; b=gecC2f/5vmalNs1X9s74P9E3uuxPm+Uw0cl+FYGW/KUuuO5O5d1sRWf5ArUi1aigSD bvXDZNQSafuDJX8qKtUDZltfQwtBV7LKgDCskhWhcXunR6Xj6BhyXxC2J63oWFYLll/n KmARtXbZutOXe0ID0u2wxN/L2D5p4XO5iob6A8JgzwMfSEXEd2CZf7kPtk2hUc57CKKr 2vaGJ1hLijTG0jhZ5iYkTKPvyPIMlK1RqwbrLLyJsgESX5tgxezyNi89DMv493hog7wk zKaucX9YaK4uWzLTdHoQX3v70iCdtudu3sr5AVyW+vG4Htn5BLeQ4DVKkQmw6ZGb0pgF 5E0w== X-Gm-Message-State: AOAM532YrID/nFIk5maW1fhc+dwD5/NYrDEIpDr4ZNoC45HFea0L58F1 HaexAgNAhsOpQfH1m/SH4eMTnQ== X-Received: by 2002:a1c:28c5:: with SMTP id o188mr4573163wmo.62.1593195772856; Fri, 26 Jun 2020 11:22:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 11sm18436456wmg.41.2020.06.26.11.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 11:22:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1BA401FF8F; Fri, 26 Jun 2020 19:14:04 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 30/30] containers.yml: build with docker.py tooling Date: Fri, 26 Jun 2020 19:13:57 +0100 Message-Id: <20200626181357.26211-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626181357.26211-1-alex.bennee@linaro.org> References: <20200626181357.26211-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Instead of building the docker files directly use the same docker.py scripting as we do for building locally. This should help ensure we use the exact same steps and allow us to cache properly when building locally. To get this working you have to have a fairly recent docker binary otherwise you will see the error message: => ERROR importing cache manifest from registry.gitlab.... So far docker 19.03.12 works (from the docker apt repos) but 18.09.1, build 4c52b90 which is packaged in Debian Buster fails. Signed-off-by: Alex Bennée --- .gitlab-ci.d/containers.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index f56aa44f711..e332af3cc46 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -8,14 +8,17 @@ before_script: - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/$NAME:latest" + - apk add python3 - docker info - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" script: + - echo "TAG:$TAG" + - echo "COMMON_TAG:$COMMON_TAG" - 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_BUILDKIT=1 docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" - --build-arg BUILDKIT_INLINE_CACHE=1 - -f "tests/docker/dockerfiles/$NAME.docker" tests/docker/dockerfiles + - ./tests/docker/docker.py --engine docker build + -t "qemu:$NAME" -f "tests/docker/dockerfiles/$NAME.docker" + -r $CI_REGISTRY_IMAGE + - docker tag "qemu:$NAME" "$TAG" - docker push "$TAG" after_script: - docker logout