From patchwork Tue May 25 11:24:25 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: 447170 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp4176009jac; Tue, 25 May 2021 04:26:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2XSESefM3NOucifIX7dnc53cBtlPLTOOWknalTlreB7c0uGepBHa9Pon+XpYbHV9+/ksL X-Received: by 2002:a92:6804:: with SMTP id d4mr21279786ilc.5.1621941962522; Tue, 25 May 2021 04:26:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621941962; cv=none; d=google.com; s=arc-20160816; b=qyHbeEKsQDvSph6GCqsLhaVOVlwqv3YKhxpJ/xmH+UL4fMuAMRAYVVbDNSvqbK25JP 6FvTvYD+YOJOOpMTobWcvyjgjnV48blfykZE5rCM6ZJrrXessor8xKSdtFNT3bzujENA BlR/TBE/AVkbrkK3hGP1ER0sMJxl0Rgk7owjZM+sO7RW5ZST9TJxz7ubTrbWmzvpWChu HOOe5vSDGN1YghlsM/7NIuTlmvqP3YGvbf1C4TTeNQcJEPqIbBODw87UlVdfUiGy+CqI 2imIDSgRuGhVki2JP6DLFOpMlJKymeGWTCmBaRx96v+v1BlZm+jXItO57svJiNQG/bD3 UKJQ== 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=bsqE2FsjJYdyQ62Ky7HDOh/DIGl1NSSD56vnVxy3+Bk=; b=09Q294rPWV4ACuaWatV6HuDX+61mfyXK3nnW2RolIBgu+z04s+fowhPt/rKV+R0Wiv H1xyjSIVBNV2bCkwx1RSJzoznVPujLEY8hHlZF4WRbgi9keIhQLPBdTPY3uvQta+QBPV eUVb+PGhDYRd85j2yxJEJQ0mGUvAq/hDrQPlPRN+S0ukb9kglUoKwhKkZ29/797k79Ch aoJ59N+Ewbna6mxk61FCiSDU4X2Y1tOY7hGEbjc8YuZt3a6pkcBI6ywrWHJ4nxEWUL/0 EuLAdVa5QrSGoMkRr8wa8TByIk2fcIuLbcV7lGCChIoIAoMilmEMBIPhS9/WV26RTI3S O5KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Xmk2cEf0; 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 h3si16173836jal.79.2021.05.25.04.26.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 May 2021 04:26:02 -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=Xmk2cEf0; 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]:43756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llVCC-0002DC-GP for patch@linaro.org; Tue, 25 May 2021 07:26:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llVAt-0002B2-Gt for qemu-devel@nongnu.org; Tue, 25 May 2021 07:24:39 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:44828) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llVAo-0002rU-Sn for qemu-devel@nongnu.org; Tue, 25 May 2021 07:24:39 -0400 Received: by mail-wr1-x430.google.com with SMTP id i17so31799240wrq.11 for ; Tue, 25 May 2021 04:24:34 -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=bsqE2FsjJYdyQ62Ky7HDOh/DIGl1NSSD56vnVxy3+Bk=; b=Xmk2cEf0gPdp9jDXKQUXGb9Sxam9fXxKHrHiOfCZaxAewxGtABY8pS2mee1k2HGred R89g3cUY1Vd8vWOu4rp3Qupes8xb+VwS3GZzHsau8kJnxFGqA4XJ+qyxjYO9T2ejddJH 7pwUpvoZIsOn6qfUmbwfNHjupvW3lkcad4uSD0RJT7e2gN8bHUSZ9qjEo5Wnx21B0gNk w4BZqxSPjRkI0bO2ThGW4hrTj9fZOPIlLmHiq5eNyiK6XoxYvW7K2cX/4GOkljKZ1vdD HLMcHU9zyJ+oScaM0W+DunXne3cIKBEzfVqmkgDtFy/Juzr0nnbtJGFy/OVsbzKN7Omg oYvA== 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=bsqE2FsjJYdyQ62Ky7HDOh/DIGl1NSSD56vnVxy3+Bk=; b=Wg0cxExvtW22SqDp66XcImghId/tPq1ebtumq+acrgJOkO4EiitaTNcT+9VQUQrxGG oouHywPQETxYy0YDxF7SumOPQulobF+784BhF4WUA189cQmfNXQbOpaCoDuSk0/na8fu gdjw34qy2rxG3jGdch2vsLRckc3WJqjSUXEENofiXeKt7hBe/LqKXCag/jFCVzGyCgdA ZjRkh8XzAQbfsZGA8w/sAubmfNjUsZg/6PIow8JVzpJzPPN7d4RkOfzj2gQ081huMkAu wDkv8267Y7dRtWfYABJKYo2Au8aThqcX4dq48TdwVuvyEUHSMbrcx93qg/cyUfF7C2z1 QYMQ== X-Gm-Message-State: AOAM533q4BFsr7aFGgQvVUemsuUf9FGlqN6Kotx3Dt5yCbXZkLv892Hm JtR5KVKUxLorq3ZNeflifdYhGg== X-Received: by 2002:a5d:534f:: with SMTP id t15mr26056131wrv.206.1621941873290; Tue, 25 May 2021 04:24:33 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r1sm15349286wrt.67.2021.05.25.04.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 04:24:32 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C95A91FF87; Tue, 25 May 2021 12:24:31 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 1/7] gitlab: explicitly reference the upstream registry Date: Tue, 25 May 2021 12:24:25 +0100 Message-Id: <20210525112431.22005-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210525112431.22005-1-alex.bennee@linaro.org> References: <20210525112431.22005-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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 , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Since c8e6793903 ("containers.yml: build with docker.py tooling") we don't need to manually pull stuff from the upstream repository. Just set the -r field to explicitly use that rather than the current registry. Signed-off-by: Alex Bennée Tested-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210520174303.12310-3-alex.bennee@linaro.org> -- 2.20.1 diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 765408ae27..3fb3c14f06 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -12,10 +12,9 @@ script: - echo "TAG:$TAG" - echo "COMMON_TAG:$COMMON_TAG" - - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - ./tests/docker/docker.py --engine docker build -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" - -r $CI_REGISTRY_IMAGE + -r $CI_REGISTRY/qemu-project/qemu - docker tag "qemu/$NAME" "$TAG" - docker push "$TAG" after_script: