[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/9] gitlab-ci: explicitly reference the upstream registry
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 5/9] gitlab-ci: explicitly reference the upstream registry |
Date: |
Tue, 25 May 2021 10:25:52 +0200 |
From: Alex Bennée <alex.bennee@linaro.org>
Since c8e6793903 ("containers.yml: build with docker.py tooling") we
don't need to manually pull stuff from the upstream repository. Just
set the -r field to explicitly use that rather than the current
registry.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210520174303.12310-3-alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[PMD: Rebased]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
.gitlab-ci.d/container-template.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.d/container-template.yml
b/.gitlab-ci.d/container-template.yml
index 9e3f3ae3c26..1baecd94606 100644
--- a/.gitlab-ci.d/container-template.yml
+++ b/.gitlab-ci.d/container-template.yml
@@ -12,10 +12,9 @@
script:
- echo "TAG:$TAG"
- echo "COMMON_TAG:$COMMON_TAG"
- - docker pull "$TAG" || docker pull "$COMMON_TAG" || true
- ./tests/docker/docker.py --engine docker build
-t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker"
- -r $CI_REGISTRY_IMAGE
+ -r $CI_REGISTRY/qemu-project/qemu
- docker tag "qemu/$NAME" "$TAG"
- docker push "$TAG"
after_script:
--
2.26.3
- [PATCH 1/9] gitlab-ci: Extract all default build/test jobs to buildtest.yml, (continued)
- [PATCH 1/9] gitlab-ci: Extract all default build/test jobs to buildtest.yml, Philippe Mathieu-Daudé, 2021/05/25
- [PATCH 2/9] gitlab-ci: Move current job set to qemu-project.yml, Philippe Mathieu-Daudé, 2021/05/25
- [PATCH 3/9] gitlab-ci: Document how forks can use different set of jobs, Philippe Mathieu-Daudé, 2021/05/25
- [PATCH 4/9] gitlab-ci: Extract cross-container jobs to container-cross.yml, Philippe Mathieu-Daudé, 2021/05/25
- [PATCH 5/9] gitlab-ci: explicitly reference the upstream registry,
Philippe Mathieu-Daudé <=
- [PATCH 6/9] gitlab-ci: Split gprof-gcov job, Philippe Mathieu-Daudé, 2021/05/25
- Re: [PATCH 6/9] gitlab-ci: Split gprof-gcov job, Willian Rampazzo, 2021/05/25
- [PATCH 7/9] gitlab-ci: Keep Avocado reports during 1 week, Philippe Mathieu-Daudé, 2021/05/25