From patchwork Thu May 20 17:42:57 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: 443302 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp197347jac; Thu, 20 May 2021 10:44:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwg+ffEZrKK5vZQqmmJSothblX6Oyqi7rzlhgwYINlil6Eh1pJZ3N6xD9iQFVo919DSd2+k X-Received: by 2002:a05:6e02:ea1:: with SMTP id u1mr6235384ilj.49.1621532689467; Thu, 20 May 2021 10:44:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621532689; cv=none; d=google.com; s=arc-20160816; b=t6njzK/sVgCEMDUep0gBUDZhMChc0N/dH1flETQAy9dbKH/bQAnt+/kA7nJbLhSuS5 weuFPdLa5BnBfUwjOjiUeaGVjGpG2midoNmGiqzTVRwZPVt4tATOGveX/tr+IunElYHA 4AAcimnOXQPw/5gUbZLtyDdxRHBnyB/3AFxPOOxZ8p2U1qihsBJ56WqX3m2xLwpmk/0h k2UqC205gKHNa6C3Bz6VPlSPSqA+Tq6NZeQYWEnmxbIgOyXtA4nSVO/7LtZZugB7lbgW a5xcnmkAA/zWv7jGF90XaN7TKqk4gtQrUrWXs9MRalhzy9xEt9TYkbjfBClvAlaVaS/M BmTg== 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=lRpwbl4DEv/eEA7OU49eaRq4xSF4MJNiaXldaMKBRug=; b=ueucfNCKs2h0IsZq6iql3WzdvQbantLf3FG2ToxpEyZQyxc7fIFoaLX9sVkdAURjlg qG5QjOug6rASHU1PFFxUhQEMjnQdUeiaFtgS+JWIH1PlG44CuydWa7Ts2Ws3F8lxQBPu uBy0aOJ4ZhkVWQvaPlPLbU8IyWcuZtAIj3Qs79fWRAjzHCgneXxuEeOm/WnaUo1AYg1s XF6j0V2DVnaXeXv11TEPbDGmnhGji3zgPtyKSWKF603lG+Rtb//LIQjMzj3FyyWQySWN n/T1CkJJ0wB5OURxwnIJxTvol3+bXEP532e4pSr9V8T9aLOvHcAMEhTjegwXwGWb+SiL oxMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rKVt4BsK; 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 z11si2786408ioq.81.2021.05.20.10.44.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 May 2021 10:44:49 -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=rKVt4BsK; 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]:43926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljmj2-00048f-Sh for patch@linaro.org; Thu, 20 May 2021 13:44:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljmhU-0003FW-2I for qemu-devel@nongnu.org; Thu, 20 May 2021 13:43:12 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:46952) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljmhR-000157-67 for qemu-devel@nongnu.org; Thu, 20 May 2021 13:43:11 -0400 Received: by mail-wr1-x434.google.com with SMTP id y14so16436367wrm.13 for ; Thu, 20 May 2021 10:43:08 -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=lRpwbl4DEv/eEA7OU49eaRq4xSF4MJNiaXldaMKBRug=; b=rKVt4BsKqB1XsDy3SD0DVeqwrhKoultdAbReL2X73FqplJg1eNNxapG6DCrLkDLSUj 1zbo9NfKqfDzkkF4/GrAYi83tuQfQFgL3Fs+NQzDAGxRWGlvK4vq9L5DYrLp55k8JKdc Fe3pf31WOfiJeb4zeTnk5BStWpaMCu4Dm7+R9MKQtdDQpERwGay7Iszl9S00aOqfJ0RE LINAErKPoFbxcvW8I6eqwbaY7I6KX9ot04Yak78euRWEy9ZJlNNWPEfDfJNle3EwXbgl NuDOoDFpE7sVQQsyUFq2X8b9UDu4ZrnXLLZdAAoxn/9u4wG91h8gvEgirUm2C1dwbika d7fQ== 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=lRpwbl4DEv/eEA7OU49eaRq4xSF4MJNiaXldaMKBRug=; b=egEZmzFIYKCCBPeAtfTSySE9JANFkV75kdqW3XyQkwwNRLHhXl/gpeYCN8TpazkV2H sS70gsceVYd69aHk5DzzkDcwk/zIzPrBPhPmvNdobEah0/KTQmWsASiSfgP6UPOlqvIQ oZMXpt+Su5Y4NAI2pIiqhW7u6j+tGTVKvZ0uqAklw+bXj/+aBx2KD63SLdhe6vdbO+5/ c37lRga45vlHX8osI82d4y2UJ+ToUU/fpCO2nA/x8zRuYzid/QSp3dXubCPalqBNA9zJ +tOXcHpu+5Kl2EJSBBSZQ6cY1x4UI0hGH9lKNz5ezGGqpboSGDgAVtW57TMGRkZFiztZ 19Eg== X-Gm-Message-State: AOAM530fBS0ahUgQW1SF0XkLL9NNnmo5BSgq/07TG6h/BdA+ai0XzN4j aU955tO1Y9M4Kjt4ZkX6pm0TEQ== X-Received: by 2002:a05:6000:504:: with SMTP id a4mr5565132wrf.51.1621532587858; Thu, 20 May 2021 10:43:07 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k20sm3835964wrc.1.2021.05.20.10.43.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 10:43:06 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B3E4C1FF8C; Thu, 20 May 2021 18:43:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/8] gitlab: explicitly reference the upstream registry Date: Thu, 20 May 2021 18:42:57 +0100 Message-Id: <20210520174303.12310-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210520174303.12310-1-alex.bennee@linaro.org> References: <20210520174303.12310-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" 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 --- .gitlab-ci.d/containers.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.20.1 Reviewed-by: Willian Rampazzo Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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: