diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2021-07-09 15:29:35 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2021-07-14 14:33:53 +0100 |
| commit | 6ddc3dc7a882f2e7200fa7fecf505a8d0d8bbea9 (patch) | |
| tree | 6ef5486c22b650f1b02266c093461ae49b849621 /tests/docker | |
| parent | 51f5c849c1036203f5979ea40f61c08f3897908e (diff) | |
tests/docker: don't use BUILDKIT in GitLab either
Using BUILDKIT breaks with certain container registries such as CentOS,
with docker build reporting an error such as
failed to solve with frontend dockerfile.v0:
failed to build LLB: failed to load cache key:
unexpected status code
https://registry.centos.org/v2/centos/manifests/7:
403 Forbidden
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210623142245.307776-3-berrange@redhat.com>
Message-Id: <20210709143005.1554-11-alex.bennee@linaro.org>
Diffstat (limited to 'tests/docker')
| -rwxr-xr-x | tests/docker/docker.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 4d9bb7c7ed..78dd13171e 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -228,7 +228,9 @@ class Docker(object): def __init__(self): self._command = _guess_engine_command() - if "docker" in self._command and "TRAVIS" not in os.environ: + if ("docker" in self._command and + "TRAVIS" not in os.environ and + "GITLAB_CI" not in os.environ): os.environ["DOCKER_BUILDKIT"] = "1" self._buildkit = True else: |