From patchwork Mon Jul 12 12:26:23 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: 473098 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2903255jao; Mon, 12 Jul 2021 05:42:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTQKaA3muzttIqnRBYIoQsnHa+SU6gkTvGrdEyZYAKKgRvQzga9FR6n9jFu7VqvQ5FjC7S X-Received: by 2002:a05:6402:2228:: with SMTP id cr8mr10940579edb.309.1626093758154; Mon, 12 Jul 2021 05:42:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626093758; cv=none; d=google.com; s=arc-20160816; b=wYdifl7m3vLsXbD1qrU8TDdWeO6NX0Xx/DNXmv9LjHO4/Dbf9jnvQP6rZlAUP8hrxk einuWqCQMCuVSs6AFa5BHgxk+ymcGuVMqKA1IL1WWjjckpxXssO2FW0V4bPToce2a8Ew cOORVQePjJVssFAQv3yvbc1OrNFDq8DbAUgRODwpVjPTJDFUeHOhKy0zSIUpaSifkR/q ieUY5iQIntD0WMYQ5BKH1ltW3EJ94MI1dwMIx4ElhMSkiJKhNGvC3sL6VhzTLJlz4B6/ tXt6+Bfjwm+cBeN7BExQOLylVnNNxMdIr7IrZTsiNy0WiJHQSswSY3jJ7+Vj6obKonvL RH+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=BvwbZLBR4hL0ldbCuEgl4dvAczyyqU5ZlfKEwgLnAm4=; b=QEbH5l9k7N8Gx90XscEwcsUsnFMWyW/ogU84acd3mUP5li8zQLaOqmUuedjVLVgPcf wQWVfQJEr32RExrp1EGRuuPjNITd1bUNykgpvD2rqEJCEdDCoUgmy5xF99Jl3v42j5G9 pdIYbxX0VeqxOAvpplRRxa6mbOd9oKlXZQ0kWSAlXFl9jiSlqB1JItbqHnyp2Z0bng7K n6psbDv2Ma/vZZ0vkixbJNLNaHNAZRi8c5TUCcJnSUbgIOQN8/SaIQAtJ+9qENY/Bmeb 24wWGuiqDTnYMKvXjUSxy1B2i+kkMyVTki+saSO9hhoiDqlPQJFutF7eA3sJTNO4PAPi +muQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="N7uS/q+/"; 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 a5si16724602edu.602.2021.07.12.05.42.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 05:42:38 -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="N7uS/q+/"; 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]:58128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vGf-0005S3-4r for patch@linaro.org; Mon, 12 Jul 2021 08:42:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2v1m-0004P5-Fm for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:19 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:37687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2v1k-0008C3-6g for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:27:14 -0400 Received: by mail-wr1-x429.google.com with SMTP id i94so25336811wri.4 for ; Mon, 12 Jul 2021 05:27:11 -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=BvwbZLBR4hL0ldbCuEgl4dvAczyyqU5ZlfKEwgLnAm4=; b=N7uS/q+/7+1+BLnASQZmYRuLyrv8u+hLp8ZCQvwEFbRFl6qH1nSIJDkHvCRvf7K/iN wnq2QvMWCLHYvKcadepO1Y0VkyxLmAybTvujIBTDDC/vTT9Oy4Jc5X0tYRHNTNHXGL3O BFWIzfjqQ+Xx0h/59GYuHhfHki6Uun5PXrS9Sz5SmnluvGy6F4WABSKH//0E3ca0HBjv mF09q/5sjsqdpXUWyHEjgTIEgcF9QI423A5o7G32Bfe79VeXmNq79+Cdw/j81CK0ruEu Oi3pxMSytde0a9E0KIh1s7Qpgd4+ue7GOzJTDeFau4bG4KkVPPACQ6huMTS0D68NSK5j CuQA== 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=BvwbZLBR4hL0ldbCuEgl4dvAczyyqU5ZlfKEwgLnAm4=; b=ARcDuOVMAGayu040WRCeEPHI5+rA/j862xI6wGtcy27VhhUfW6O3j0YfeTr3SAAiiP kCPCdcr2oajV9EzW6MbrG6xbmKrXm5dGxIdQ3OLJtJt4v/9MgeQtm8lxx6jmXDVORVE1 3KqIlr6o+GkUrXD0bR0VWUGnX0WqDCiDkRrOEZiEDcUqZxtVj5Ejo4Q+b7vhlK2w341O hcjnOdS7U/R4+6PBPESERaD0uKks9dUtcRo9IrL6CtqboqSGWC9NT9w1Heiy9YGIJHEh 3jtY00MCVtyLBCb6RpDyeoJ11Z+iUFqqKtErNeWKah3oU4HzK/rO/7QurrdkWZJc2GbI U2qA== X-Gm-Message-State: AOAM531/dup1jnA9oYDtlun4nV/CRFxEvwK9CMnNmhZOppb2tn5xSNxl gNJbeQz1sPtCVsFIWDIlME1Keg== X-Received: by 2002:adf:f60a:: with SMTP id t10mr34154155wrp.127.1626092830808; Mon, 12 Jul 2021 05:27:10 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j16sm14163649wrw.62.2021.07.12.05.26.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:27:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D31201FF99; Mon, 12 Jul 2021 13:26:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 10/40] tests/docker: don't use BUILDKIT in GitLab either Date: Mon, 12 Jul 2021 13:26:23 +0100 Message-Id: <20210712122653.11354-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.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: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Willian Rampazzo Message-Id: <20210623142245.307776-3-berrange@redhat.com> Message-Id: <20210709143005.1554-11-alex.bennee@linaro.org> -- 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: