[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v1 11/13] tests/docker: fall back more gracefully when pull f
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH v1 11/13] tests/docker: fall back more gracefully when pull fails |
Date: |
Thu, 9 Jul 2020 16:46:25 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 |
On 7/9/20 4:13 PM, Alex Bennée wrote:
> 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:
Maybe worth defining EXIT_SUCCESS = 0. Otherwise:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> + dockerfile = dockerfile.replace("FROM qemu/",
> + "FROM %s/qemu/" %
> + (registry))
> + else:
> + registry = None
>
> tmp_df = tempfile.NamedTemporaryFile(mode="w+t",
> encoding='utf-8',
>
- Re: [PATCH v1 06/13] plugins: add API to return a name for a IO device, (continued)
- [PATCH v1 04/13] cputlb: ensure we save the IOTLB data in case of reset, Alex Bennée, 2020/07/09
- [PATCH v1 05/13] hw/virtio/pci: include vdev name in registered PCI sections, Alex Bennée, 2020/07/09
- [PATCH v1 08/13] plugins: expand the bb plugin to be thread safe and track per-cpu, Alex Bennée, 2020/07/09
- [PATCH v1 09/13] target/sh4: revert to using cpu_lduw_code to decode gusa, Alex Bennée, 2020/07/09
- [PATCH v1 10/13] tests/plugins: add -Wno-unknown-warning-option to handle -Wpsabi, Alex Bennée, 2020/07/09
- [PATCH v1 11/13] tests/docker: fall back more gracefully when pull fails, Alex Bennée, 2020/07/09
- Re: [PATCH v1 11/13] tests/docker: fall back more gracefully when pull fails,
Philippe Mathieu-Daudé <=
- [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