From patchwork Wed Jul 1 13:56:50 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: 192158 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp531704ilg; Wed, 1 Jul 2020 07:12:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxt4nqJbVcav6sljs3BWrE+5ikaQo+BoJV8us4Z+VD/UXoaR7wn6uHMUoSSUzRbMg+EZBdr X-Received: by 2002:a25:1843:: with SMTP id 64mr38410375yby.89.1593612749706; Wed, 01 Jul 2020 07:12:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593612749; cv=none; d=google.com; s=arc-20160816; b=BajEIBQbQCmJzarorU2Sz9tssutbvFqqmWCvo0/KQwlePp4M5Duv6LxjX2yfNQym7J bPhhnvCf5BHyPdfvnulrI1M6ICRJzcSfgZjBbVdz62wE1v13FNimLZFLVMqsTRo+S/9W dXopiP7zz3FrFrYx8LS3RZ2VhEunB5UhL+xiRYDJXOMOvzWk28jc1HNMJ06oU0JO2s+e SPm+0ZoZYegdiPZl9ISzayN6K8NByHivdDby3PR2kMzb+RCdgyHoudW5OiPaYoviZqqP 6Cg0vCVlFtDmrTB8tr6Pdu2LZoL3VPD7kwAQablz0RwyrSqfSmgB2vZMC1E7jhDn3Q4T SG+w== 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=6WtCLGQRv0MjUdUMAEZUN6efvnmj6vJqFczlhuv8qdY=; b=sjXn3zvx/+1QSSaOs01TLRzRV+VyI3E5aH+b+LarHUOhQwpMEq1MnMGIDDjlgSJa03 CYoXSsABKhF8P2YeNjF53cvePHpPeshEOu0w9BndNQRR7tU7/aSrywoW/KNCfgmQUfaw F+56NuqWpK4nMxDeRMvnEOcN4BrN1EIPSFP9X3/vEGYlUSkAvu+mcAYoA/25TafjHu/I F9vot0Zv+EonfbJzXQJVbBTkJirZYnslmpq7k4lZG80BKECP+CPddJIt4x3PrAffhXdw ZUb48AzsrI8rM71tJ1KeCdGwJj/7cZ5D1HI0MNjFK+AB5YJxFr9VkX/6K9syFut/AkSg tUnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QqQwjLi6; 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 v13si5811169ybs.299.2020.07.01.07.12.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jul 2020 07:12:29 -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=QqQwjLi6; 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]:59794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdTR-00032p-4N for patch@linaro.org; Wed, 01 Jul 2020 10:12:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKy-00056C-Tq for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:44 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40161) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKx-0006qf-4V for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:44 -0400 Received: by mail-wm1-x343.google.com with SMTP id f139so23386622wmf.5 for ; Wed, 01 Jul 2020 07:03:42 -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=6WtCLGQRv0MjUdUMAEZUN6efvnmj6vJqFczlhuv8qdY=; b=QqQwjLi6YMb46gu33K/TpzYfCNGIN43MXqPRXDIsa6R/ZiLe5p7ZJ/vE/Rg4yh3uVf Cbr2pw1JMakjN0l5veMvTSXzn+ueigEJCXFYJuxCpHVfvVJBTlql2K/MjcPcCVd0XCfT YAmpJ7VzFAwJO+LUR2w9LUeSO1AcuZGrBH33b7AxyyWg7EJ8PYyudr6kponaGkxAsGVX /xhXR8Vz+CUBRDxdTeh+/diUwy82SpCRlZ9ZdRhRHDDLH1Nt32JiYjsksqsSWoUCx55V WBvKSE9OJMANPshS8ZsltJnsXVCwcoSTtIRh2xY96mFDM717lqKc9q2ob1FdNLkVSPlX nU+Q== 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=6WtCLGQRv0MjUdUMAEZUN6efvnmj6vJqFczlhuv8qdY=; b=pdZosqypbE0bWMQ4+bGaCELH+o/+Qsz2T35aw4EQ4cTvizBw+wQV/ZSzq2HbzK6pTq iJV7EdBkDu3ki1t3rr9lUTodvsTL70p8d3V5jF/6MYXDA383x1j+LlkinyNLStVfhZcN fdCGd11dspSxPDvJoy4aU8BtRxS2LasI1Gy/fXI4XP4/QYaskRnpicMisY8UegC3ouae ZkW+2ZhQANvXxuI1qvCxWk5mzzfgFuUfBNi/ck1rQwp2H6eFIbS2S77MS2DuP+kxts2c L5VGFLPTD3d//GfwcCfGj7sAKlRVXtYzr0tW7sHzLvuYEHks879xn+8DroACGbKGsNYv JR4A== X-Gm-Message-State: AOAM531IGyPl7kZ8G58ghPU5u+4/jmN4w9uL7rT+6rsgIL6pOb/EdsgS mcDrW2G+Wv5AQvirPjGUGsqo4Q== X-Received: by 2002:a1c:4408:: with SMTP id r8mr26937260wma.100.1593612221643; Wed, 01 Jul 2020 07:03:41 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m4sm7346717wmi.48.2020.07.01.07.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ABF9A1FFBF; Wed, 1 Jul 2020 14:56:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 38/40] containers.yml: build with docker.py tooling Date: Wed, 1 Jul 2020 14:56:50 +0100 Message-Id: <20200701135652.1366-39-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x343.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 ea350eacff7..b1e39cfd9ac 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -6,14 +6,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