From patchwork Thu Jul 9 14:13:25 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: 235156 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp1457055ilg; Thu, 9 Jul 2020 07:19:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9uIC9JUbH0gucG8NacvlKAjOWQeEvqT2+kyJ+lzZy7FVahjUzoZoRIxwvYpVfKyXIhzqC X-Received: by 2002:a5b:c46:: with SMTP id d6mr104640056ybr.490.1594304364510; Thu, 09 Jul 2020 07:19:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594304364; cv=none; d=google.com; s=arc-20160816; b=W0bhFbYiZIb3rAhGZ9F4noenmtBsl+xlrphH9n3t3PGnDhswWOec4ySru5EQIxSl7d QbOR46iLhj0BUsctSSgmEqGT6lGiBY/fzbC+T9BGa9gnHZrAa0WBC72T+/vWEKlJ1rho 8F5r+zI9Q3TAFVEGzbblk30ewrvokxjoLSHAUtBU4hDMqiWR4zoCm4xQSrEC/Ac5YBf5 Yg98qOd5LX9w2jlA9xPTG4Ucrr/KnyB0sX31tw3Ad0/p9v92KJryuQguoHdcIIBeDdAg Svl41vaXhrBsOdbb9Oif9brq0NcCxM51nvGKj8sRWNRrrkkhkXxxB7IdZKJ+37wrJ71M kldw== 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=CYKi9P2sb/KSIxgc0hWiYAqxm+j/yuO8AIw+hiHGW8Q=; b=nUxwBfPFmYkgggy8iVNcvTn/9UABEBkaU3M9CLZ8lgmBzx5ZCMg1P6uBCDjE6yLHj1 ZUqgQt9RpG9sSNbnjiHMGEtuWyqFA/dBiOXyTgxCF4xnoBViBpoO3txEzE1spQaEa0UP aeZB4+nctC2jxe8xqc2WvLsRJk3hDywdDxmsraqE8K8dVfJiK1VxEnjVfT9W1gFqOFgg T2BccpQYOc2WdR28FSZR0cQZ4tilicETtqTjajVsVlEc8Ep/IKL+ovq9j+9WQ7PIBThT Zq3kQZrBkT/r/N0NCH8tqYc0UjxdyPgs3sCKsfBTF8Av7C7Uq6wYwTz51rpdXSv+0rG6 WZJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="OETuDee/"; 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 y18si2797382ybr.136.2020.07.09.07.19.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Jul 2020 07:19:24 -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="OETuDee/"; 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]:53712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtXOW-0007VW-08 for patch@linaro.org; Thu, 09 Jul 2020 10:19:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtXJ5-0000WQ-SD for qemu-devel@nongnu.org; Thu, 09 Jul 2020 10:13:47 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:37060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jtXJ4-0001Lj-9m for qemu-devel@nongnu.org; Thu, 09 Jul 2020 10:13:47 -0400 Received: by mail-wm1-x342.google.com with SMTP id o2so1980048wmh.2 for ; Thu, 09 Jul 2020 07:13: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=CYKi9P2sb/KSIxgc0hWiYAqxm+j/yuO8AIw+hiHGW8Q=; b=OETuDee/gKUepqTzzA/1/0eB6wAG5xehvoDlGLBs6bNt2ti9btU+hhAceHcDMOYElT rzL7GxahM3ZtGIcsloTe5H34ZbCaXhwhVxidIu9dWtneytypgR2+6p7kbKybc/uLVuLR shPjIkRoE8lo5jqdnxkr6oflWTh/8MXHMQZjNqx22W/n+vOxOJL0yDbnCjMzEddyo3OU +abbvrojblXAchnsJBI6d5Djn2XdAQSxw5zs8iBoCnATDepT1YGYCpX6rNuvYp2i83H3 4ZGk1NA5kGETuGUzngktPYxVBjVuNGHqmF3U690GCQjt03fSfncTQruQPW4e5OiSrOFb 8O3g== 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=CYKi9P2sb/KSIxgc0hWiYAqxm+j/yuO8AIw+hiHGW8Q=; b=MJKovdGgXHUwaPOVnV6lzEuEZwuOkHEi57mJHvRMrUWGAhK/B8TESBnFRkORUwDTPe 147EG6kXBqHpTHTirD/5+Qp30jiirKLuzhValM4/uMve+9/Jh/x/73uhM261rey1AscW /FU5V/faGxLggnNQJhJZ3yUUn5v9lPqTsE6VEIrJFlCc1RCyxiV3o1JHzdBN/4BNxOG9 Q5XiTLrCqgDWEcb8p87oP4RYpIXuGLQu6zOr/25wN6IOola5LuhxdJt+M49JR3FV5HPW 53aTXOCMTDTE6T4JNxcy9mrcir3G6c22aSGW68E/WWaHEPRCjys+jrTYEfxf4J1Yc2JV gGuQ== X-Gm-Message-State: AOAM532RXY+DqZBQgZxn22+M6kUVa01HSXLf2AQHRmfbITFylv1O/jXj 2Eq9xbDQqu6KUa+b4HU17SZtkw== X-Received: by 2002:a1c:f60d:: with SMTP id w13mr215476wmc.51.1594304021844; Thu, 09 Jul 2020 07:13:41 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q4sm4932417wmc.1.2020.07.09.07.13.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 07:13:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6EF8E1FF9A; Thu, 9 Jul 2020 15:13:28 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 11/13] tests/docker: fall back more gracefully when pull fails Date: Thu, 9 Jul 2020 15:13:25 +0100 Message-Id: <20200709141327.14631-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200709141327.14631-1-alex.bennee@linaro.org> References: <20200709141327.14631-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x342.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@euphon.net, berrange@redhat.com, robert.foley@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, robhenry@microsoft.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aaron@os.amperecomputing.com, cota@braap.org, kuhn.chenqun@huawei.com, peter.puhov@linaro.org, aurelien@aurel32.net 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 --- tests/docker/docker.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 9684f07bdebe..2d67bbd15a5b 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',