From patchwork Sat Jul 11 17:07:27 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: 235302 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1466540ilg; Sat, 11 Jul 2020 10:11:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2LOKO7LpzUpwS7qBvzTRqWZB8Qyp9b9ZIGmWvsjiV6cQ5utHIbu24jkcFDrbAMQQn8kLp X-Received: by 2002:a25:c606:: with SMTP id k6mr73586142ybf.0.1594487466513; Sat, 11 Jul 2020 10:11:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594487466; cv=none; d=google.com; s=arc-20160816; b=eKc9yCelQhbIB7hhryOr4dUQocmN5gD/LtHLIJn6mDjNcyxqA4YIYVoM1GWpMpf7U7 1V8rD44mI3qIVgMmgQx5gYUbUxCuF+UgMoN8l54/yAFrokvmNFvFDFjGiMhufReaKclo ppEWp1sUniZm7pjs6XRlndAge7PmJyTc7TqwodE9uHRpzOFQroRDApmw7f9W0D0rei72 AJnBZHbkFbAoda7S8wetKBmDdBxZYXd53h3Pb7mXSjIiTkSnYjGZmqCFAH+RFJSY/Nuu MUHtw3s4OeWx3fw6bUXZuNo9y4jh/UQFN+BHJbolFCNXQJ8Y3xT9J7k0citqQbKjzcFs Emrw== 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=E9CuosGjk9g394MPaOCwB+YyiSzHRQhNU7g8s+eLFcU=; b=sFsw/wPfDD2IymfZ98yudOKVkHcYGjB381Jrn2tSetAPREwsHXwZtzyc7Xvc6XIWMa 2BdD6zN+hGbnmt5lAAYJ5qAmdrD/F1VgFR64wR3SFJkWuQxoc9kWgtJjeVvM9lLkRapq Nk/eHFxz1rRFT/yNRyg+OlKG10vS1Z76oMAB5gCDJlGC9xZ0XQO0GPn6/PVsOYYMa3KI 3SOrSxFBNfZUNkRK9co3doKCkA+Q5qZdiLCUglK4UQfFHt+ibyFg0F9NdabwKkJypH1H v9bnBtSy2ZXrw5Am0ZH1TnnB1CAKRh8lQ1pYxm7I8EWAVHLsIlBQ5iMVc+QHdYhp79ie 1+fQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FB5ldr8o; 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 c5si8771972ybn.72.2020.07.11.10.11.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 11 Jul 2020 10:11:06 -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=FB5ldr8o; 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]:55836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1juJ1m-0001AW-2E for patch@linaro.org; Sat, 11 Jul 2020 13:11:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1juIyW-0003Uq-3h for qemu-devel@nongnu.org; Sat, 11 Jul 2020 13:07:44 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:40540) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1juIyU-0006ho-DU for qemu-devel@nongnu.org; Sat, 11 Jul 2020 13:07:43 -0400 Received: by mail-wm1-x344.google.com with SMTP id f139so8926268wmf.5 for ; Sat, 11 Jul 2020 10:07:42 -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=E9CuosGjk9g394MPaOCwB+YyiSzHRQhNU7g8s+eLFcU=; b=FB5ldr8osz/TSX0u/QFjRhnpH0+caCl5rAhip61Uuth6uGTdVdVV6J4iewPPBbxaUc hpaVH52rzxRgCukPcmqICXXelHyibjwSr9EjORG/x9WIhYxgnM/x0N3B7lcu9VF5DpX5 76967JUM87Zy0YBfGtCNtQ0VgGTSpCdjrhbtyY/vUZJgSGA8/RmhZGvJPjPshNtSlarV MRzOxMgoShLkr4a5qRplWp6cZ1K+C/0tJe794U1Iee+vD8i5jJsBir4GPhTEVFuwzVfv VhFXiwpnKUXlO2twc8qaUutFNZcuXFxQXJCpKuM+C4GzXb65mqLR4NB+2g93FgCEfUFU n59Q== 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=E9CuosGjk9g394MPaOCwB+YyiSzHRQhNU7g8s+eLFcU=; b=NOCeISqLDKDKPmQc32MzLZO6oBgJhW6Ke11rgvFUHMitkupHLkeYhv1g214evrDQHz 2ACtE+Tu6CVhIjlORqc4kdtdv/RLKnohdNDwuYMK6c1v/pELz+6cBnZzvX9Ui9TKlvgb LxGRX9cRuqLjp2/PEGuD7r8Ja8fBMYDKRYAXEpvOm/YU83z1Hh9emDxwzOBnp6Y632ev b3hfD7N/RQnHyo0US98xqPmBNpHvGsc+MEJyKe2w6NwdSR4MUAWX1K7y7pS1gxUs/eS1 wwvSc7SHe11AhNx8plSi5I9exnSqmCB8xmQpGaFCd9xwvQyAzULAI9Esqgzy/FFcLz4d LnvA== X-Gm-Message-State: AOAM532hq09Ha75uUbovFC8g8kWT/wLB9vick0XtbaEOdNw57SxnU1EZ XJReH9x12JcFplmaagGlXd6NvA== X-Received: by 2002:a1c:6a13:: with SMTP id f19mr11473311wmc.106.1594487261113; Sat, 11 Jul 2020 10:07:41 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a15sm17558674wrh.54.2020.07.11.10.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2020 10:07:37 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 91BF91FF91; Sat, 11 Jul 2020 18:07:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 45/50] tests/docker: fall back more gracefully when pull fails Date: Sat, 11 Jul 2020 18:07:27 +0100 Message-Id: <20200711170732.26213-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200711170732.26213-1-alex.bennee@linaro.org> References: <20200711170732.26213-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x344.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=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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" I only spotted this in the small window between my testing with my registry while waiting for the gitlab PR to go in. As we pre-pull the registry image we know if that fails there isn't any point attempting to use the cache. Fall back to the way we used to do it at that point. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200709141327.14631-12-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 9684f07bde..2d67bbd15a 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -306,13 +306,14 @@ class Docker(object): checksum = _text_checksum(_dockerfile_preprocess(dockerfile)) if registry is not None: - dockerfile = dockerfile.replace("FROM qemu/", - "FROM %s/qemu/" % - (registry)) # see if we can fetch a cache copy, may fail... pull_args = ["pull", "%s/%s" % (registry, tag)] - self._do(pull_args, quiet=quiet) - + if self._do(pull_args, quiet=quiet) == 0: + dockerfile = dockerfile.replace("FROM qemu/", + "FROM %s/qemu/" % + (registry)) + else: + registry = None tmp_df = tempfile.NamedTemporaryFile(mode="w+t", encoding='utf-8',