[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 11/13] tests/docker: fall back more gracefully when pull fails
From: |
Alex Bennée |
Subject: |
[PATCH v1 11/13] tests/docker: fall back more gracefully when pull fails |
Date: |
Thu, 9 Jul 2020 15:13:25 +0100 |
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 <alex.bennee@linaro.org>
---
tests/docker/docker.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
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',
--
2.20.1
- Re: [PATCH v1 08/13] plugins: expand the bb plugin to be thread safe and track per-cpu, (continued)
[PATCH v1 11/13] tests/docker: fall back more gracefully when pull fails,
Alex Bennée <=
[PATCH v1 12/13] tests/docker: update toolchain set in debian-xtensa-cross, Alex Bennée, 2020/07/09
[PATCH v1 07/13] plugins: new hwprofile plugin, Alex Bennée, 2020/07/09
[PATCH v1 13/13] configure: remove all dependencies on a (re)configure, Alex Bennée, 2020/07/09