diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2022-03-15 13:41:21 +0000 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2022-05-11 13:22:21 +0100 |
| commit | b754051722b0c354880b83109da5dd13c9d2a0c8 (patch) | |
| tree | 9f1cc7631cdab7a2e0ae8208f3351fb339e16c87 | |
| parent | dfcee653ec568e54c067ba2b702ef7a059752187 (diff) | |
| download | libvirt-ci-b754051722b0c354880b83109da5dd13c9d2a0c8.zip libvirt-ci-b754051722b0c354880b83109da5dd13c9d2a0c8.tar.gz libvirt-ci-b754051722b0c354880b83109da5dd13c9d2a0c8.tar.bz2 | |
lcitool/manifest: don't hardcode gitlab container registry name
We use env variables everywhere else for the gitlab container
registry server name, so lets be consistent.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | guests/lcitool/lcitool/gitlab.py | 2 | ||||
| -rw-r--r-- | guests/lcitool/tests/data/manifest/out/ci/gitlab/container-templates.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/guests/lcitool/lcitool/gitlab.py b/guests/lcitool/lcitool/gitlab.py index 8931c34..c1e098d 100644 --- a/guests/lcitool/lcitool/gitlab.py +++ b/guests/lcitool/lcitool/gitlab.py @@ -25,7 +25,7 @@ def container_template(namespace, project, cidir): - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest" - export COMMON_TAG="$CI_REGISTRY/{namespace}/{project}/ci-$NAME:latest" - docker info - - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + - docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" script: - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "{cidir}/containers/$NAME.Dockerfile" {cidir}/containers diff --git a/guests/lcitool/tests/data/manifest/out/ci/gitlab/container-templates.yml b/guests/lcitool/tests/data/manifest/out/ci/gitlab/container-templates.yml index 15d1072..47bed1e 100644 --- a/guests/lcitool/tests/data/manifest/out/ci/gitlab/container-templates.yml +++ b/guests/lcitool/tests/data/manifest/out/ci/gitlab/container-templates.yml @@ -8,7 +8,7 @@ - export TAG="$CI_REGISTRY_IMAGE/ci-$NAME:latest" - export COMMON_TAG="$CI_REGISTRY/test-group/test-minimal/ci-$NAME:latest" - docker info - - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + - docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" script: - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers |