From patchwork Tue Jul 6 14:57:48 2021 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: 470457 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5086858jao; Tue, 6 Jul 2021 08:06:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDvkEz+LeacucNUiA/VxDamSXwXSmnCHgt9jLM/QNB1ik8SrzdKlCF918W2r/4g+Q6n3v9 X-Received: by 2002:a05:6402:1357:: with SMTP id y23mr21701019edw.244.1625583972221; Tue, 06 Jul 2021 08:06:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625583972; cv=none; d=google.com; s=arc-20160816; b=wyxfA3ZMA8M/IedYUdCVwCqYNFz7vA+RMNydWqmd+gfG4yZTlBu5Hqd/ysJiHM6RfR zau+wWvb+EBF4/jbbUCCy+pE7IkIYPXeRvmKgCG7tsY9GKF5q0hgN0pak74Nk1jaMxFT qAGiASaAuiPtcehDkiD1Ev+jt3EZqkS/1Ldxg8QSvwySyjjXA2FHT22An8BFzdavJLjx kdYbxUQ0m63LbQLlFGcGsbIOzeIp4TSwvSYDMy3vdcdPQYpQjQHmMmvGEzogtRjVr12A Jh9g0eMcCCiU1F3dewqXy1Jkxa1ALMkpd8Pp3C28plWBgtIyUh4Q0pR2YjWzK6xmThjV zKnA== 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=MIjB8baV6ul8gNmy4v7s1kUfD6hLb3gxxyQmdjTCbfU=; b=JjwE5mDhkDJA2gGv04ZaexUu9e9C73W2NrFCtgqMM7zpoIG0WeDvSBc5+kJ44k2oyK GhloMADBGRbMJ6hNUPkeM5ryuro4TqkfiKOGFhRUo+tllYksXcRHyscLl/O7E3omvBku McvwFDyuXsAXL+yRQu3ti9T0WrrbLknlZ/F6nW6RnnlStn1AiTZCt/p9N+xeibo5aXx+ CBI3ZpdaczGEc6LbiZcQ0mcyX6lrohDIDmbHHl86bidVv3UefF+AnghalYReO+ZgHnMZ Ray3A5BgSB+QDysTasQA3IEX5Riyz1KpdZ8Ylm4meYFYo4t5pXxyPIX9sEVEzjEuCZY0 bJYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=q7ndubA4; 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 ak17si16836368ejc.234.2021.07.06.08.06.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Jul 2021 08:06:12 -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=q7ndubA4; 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]:37804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m0meJ-00082v-7U for patch@linaro.org; Tue, 06 Jul 2021 11:06:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m0mX9-0004sV-Vq for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:48 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:39465) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m0mWz-00025P-CI for qemu-devel@nongnu.org; Tue, 06 Jul 2021 10:58:47 -0400 Received: by mail-wr1-x434.google.com with SMTP id f17so1840668wrt.6 for ; Tue, 06 Jul 2021 07:58:35 -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=MIjB8baV6ul8gNmy4v7s1kUfD6hLb3gxxyQmdjTCbfU=; b=q7ndubA4R6lUyedVGgXg6NdEBbsItZchYncSIqWcBN6/g7yDLTJwQyExgTuoqMSpzh i2gB3DdGptai5/STOHFAbiHo7DlOgV/pU35xyx5vjEI4aOIbT9mVPOpHWZGANTUpDpO1 3P4QY0r7vcwfTmgeFSWGi4VxPJunarxcIkSxATE1UwPa+lALY+WwAKMGrxkVHDEYFcqf s9eB0iS/4c+kqa8gqtVEfwLZ2YHAvFZ+WaZTO6LvxMqiLYuMo+yLHTYFBsHSqTa/qI5k s3pNBBfgFfOx6T1u5/VMC7o74/ZVMpyxsVpAn6CvP8D7JwE/VZC9HBoosD8M7n6ZBHfm QULg== 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=MIjB8baV6ul8gNmy4v7s1kUfD6hLb3gxxyQmdjTCbfU=; b=V1Om+U7U+JgOX0jJwUrn+4nQyKBOo7G6/Eac3YEHBnATexkCBSKVWT7Flu0PKtftWD ZZzqPTRGvSj9HIHt8MlfvLmTaSuKLiQ4FlYvyubeqauEmmh3Qi9mm1mYdBp030eJ7r+B AJUN0XV7UcfwUKTUb1GUXQhlltN/yGKCFbC78z0g3IibdRwlBqfJoTaYMR6muwdOHzSO J0utTaAL5aeJMBltT/SuzemrpgEhd0qZWMkPh9NsnMjnFB2an9bgrshlcjQcDjWcDcAF sHcme7iej76sISLlUdux036pc2NXCrsmJwGaVa1c8Kg6WQ1ZYRTFtEE6LxoBz3Z+8ASA RoFA== X-Gm-Message-State: AOAM530r7trV5CouOZ5HwVC1+JRpd6QGgINJcBPuMZwv5cRZATYVJ/G+ w7sA3Wtl3tFN5U85DhNuSt6Prw== X-Received: by 2002:adf:b605:: with SMTP id f5mr22424323wre.419.1625583514364; Tue, 06 Jul 2021 07:58:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y19sm3287863wmj.33.2021.07.06.07.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jul 2021 07:58:29 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DD6791FF99; Tue, 6 Jul 2021 15:58:18 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 10/39] tests/docker: don't use BUILDKIT in GitLab either Date: Tue, 6 Jul 2021 15:57:48 +0100 Message-Id: <20210706145817.24109-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org> References: <20210706145817.24109-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com 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 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: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé Using BUILDKIT breaks with certain container registries such as CentOS, with docker build reporting an error such as failed to solve with frontend dockerfile.v0: failed to build LLB: failed to load cache key: unexpected status code https://registry.centos.org/v2/centos/manifests/7: 403 Forbidden Signed-off-by: Daniel P. Berrangé Reviewed-by: Willian Rampazzo Message-Id: <20210623142245.307776-3-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/docker.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 4d9bb7c7ed..78dd13171e 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -228,7 +228,9 @@ class Docker(object): def __init__(self): self._command = _guess_engine_command() - if "docker" in self._command and "TRAVIS" not in os.environ: + if ("docker" in self._command and + "TRAVIS" not in os.environ and + "GITLAB_CI" not in os.environ): os.environ["DOCKER_BUILDKIT"] = "1" self._buildkit = True else: