From patchwork Tue Jul 7 07:08:53 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: 234935 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp658878ilg; Tue, 7 Jul 2020 00:21:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxedsbWNX7o5T53fQb1I55K/DW8f79JNj+8ZgneBgOYFZlWDOg98UhKc+P2+kxsM2j2yGBX X-Received: by 2002:a25:d807:: with SMTP id p7mr32023048ybg.229.1594106492193; Tue, 07 Jul 2020 00:21:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594106492; cv=none; d=google.com; s=arc-20160816; b=kLSR5S1xs2Q3qVMRlOn1OGVdP8SVE30t4skvnntGrbKt5VoXPt0hVKk9Z/NqZXLYir mV53/ylU2d18pxCEMqnOq8K+qx116IRD/NtoG8DpWcH8V+/7W5lkt0ZWJ8qNjsK6hWiH lJ1j/8eFRO1b9IiZgj5Xhl0mFSFi/lCzjph5JoTn3FBWZj8z2I6QyGfZCG2RQ08U+6BB 03G2D8TfH+JWriq4V6EdNfrydSLwpNnAfxgyGGEMKx/MA66LJQGTCQvfYZ3WQaZhe9L6 jvW3Rt9kK7TuMTHqmnBYXkELUAWwli7GgAhxuy9WYGcqkk40vxyjcO+BYefD05N7mSfz DAgg== 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=ghYwsDv8y9AcQ/2pLkPngqM/jomzSL1uaEsogMN8yjA=; b=OXzy6eqFFyC9PJw5a8XmUuy35dJ8GtL0gRELxpyrOer82b5/jmOzLtlzsAxDRdidVK L+oCdDzcORze/hMret0H/4RVEzTdC9YO+xaJD7SqDR2GI6lzSvf3uhSfsFH6gElOcreQ AQiiqF2epUz0gqDj3MVNv3akSEoxhl/IzwtraEplhAa0iOJLRkez4hLP+K3bQCQFUEIn RZWbkJ8NnA4waLAFpTjq2pYHw5S3O1/ILLDHEEj1vBJA3vSXjl3uYJv8hRAVpLMIOpXh seWRMLNSb8NEAZdZY8xDelm41b3MRU2MylFb6I+M+qBKZZgPUWCpJXaJkm4pF7O1elwE CddQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZwAaBEp2; 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 h126si11147630ybh.84.2020.07.07.00.21.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Jul 2020 00:21:32 -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=ZwAaBEp2; 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]:35496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jshv1-0003is-K4 for patch@linaro.org; Tue, 07 Jul 2020 03:21:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jshoJ-0006lH-C1 for qemu-devel@nongnu.org; Tue, 07 Jul 2020 03:14:35 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:54862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jshoH-0004rU-K3 for qemu-devel@nongnu.org; Tue, 07 Jul 2020 03:14:35 -0400 Received: by mail-wm1-x32c.google.com with SMTP id o8so42116085wmh.4 for ; Tue, 07 Jul 2020 00:14:33 -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=ghYwsDv8y9AcQ/2pLkPngqM/jomzSL1uaEsogMN8yjA=; b=ZwAaBEp2m32zYdEjsxYfPLNW+Rr4BeBFvs4P9zd7IRvhyAh388q1dePAcoZFUMxnYr v0f5od3tplSIgYsWsQlIFSKTLrXSdBgOJIC4LDLizUik+nJTHMGYx4XWOOTq49hqWR24 Fhe85TwFNBHz3MSy+zDJV7lMX+O+iFJ6ny+KUd+lDvO/XjU7KTphv5yea2Px8tUDdqHy sqFzZgQfNQyA3hepmm4778QSkHkQ1ak9Gu8HPn33rDyZJ+wZt1rHoStZzQtwBdLSlNRr oGEnRfToO2Mtv1d0T/Anlme3EhBPgcr3VEU8BcX6OgcOd9d8mLk2CTI+BwW7XyyYa788 DENQ== 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=ghYwsDv8y9AcQ/2pLkPngqM/jomzSL1uaEsogMN8yjA=; b=dx45DmGlFpFiRfipm9diaKXy7jSVzAyyPC7jvvTXS8p865MZN8cgVIblV3wNZun2e8 irBQqspXzKxzktTnQ2KKKVvTQk9OEfnOqBAl9mFKsUIMY/ZgQroxNefIppcyOjfNo6bo sEvOp3BScAN54NSsl4USq7qHBMzdjbAqA8Sw5GtOpCGD6oaqDgoQjOW37acW05DdpOfz CJYDJd5Wdf7f/ZzX5stZbY9lyexqo43xPZgAYA+1/vA+TPTPZ6gKFs/BjjNQUehbEUV9 pmITcA5L078OhrpnxLwdLvzUnSZCBnzp+y87woHlg8xhO0uL+lpv1DIIzFs7coE2ZKpI PF8g== X-Gm-Message-State: AOAM531qETlSVItGvCOwwdY0s3u3g2swId5zgmxhLJYO4XmeKNj0UBhn GF8FXomZFk2EpFJYzKbwpIFTCQ== X-Received: by 2002:a1c:1fd1:: with SMTP id f200mr2592718wmf.162.1594106072232; Tue, 07 Jul 2020 00:14:32 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g13sm28007940wro.84.2020.07.07.00.14.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 00:14:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 15B181FFBD; Tue, 7 Jul 2020 08:09:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 36/41] containers.yml: build with docker.py tooling Date: Tue, 7 Jul 2020 08:08:53 +0100 Message-Id: <20200707070858.6622-37-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200707070858.6622-1-alex.bennee@linaro.org> References: <20200707070858.6622-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 Message-Id: <20200701135652.1366-39-alex.bennee@linaro.org> -- 2.20.1 diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index ea350eacff70..b1e39cfd9ac1 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