Commit 85c5e699 authored by Alex Bennée's avatar Alex Bennée
Browse files

tests/docker: fall back more gracefully when pull fails 



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: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200709141327.14631-12-alex.bennee@linaro.org>
parent 50679467

tests/docker/docker.py

+6 −5
Original line number Diff line number Diff line
@@ -306,13 +306,14 @@ class Docker(object): 
        checksum = _text_checksum(_dockerfile_preprocess(dockerfile))



        if registry is not None:

            # see if we can fetch a cache copy, may fail...

            pull_args = ["pull", "%s/%s" % (registry, tag)]

            if self._do(pull_args, quiet=quiet) == 0:

                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)



            else:

                registry = None



        tmp_df = tempfile.NamedTemporaryFile(mode="w+t",

                                             encoding='utf-8',