Re: [PATCH v1 2/8] gitlab: explicitly reference the upstream registry

2021-05-24 Thread Philippe Mathieu-Daudé 
On 5/20/21 7:42 PM, Alex Bennée wrote:
> 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.

Yay!

Reviewed-by: Philippe Mathieu-Daudé 
Tested-by: Philippe Mathieu-Daudé 

> 
> Signed-off-by: Alex Bennée 
> ---
>  .gitlab-ci.d/containers.yml | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Re: [PATCH v1 2/8] gitlab: explicitly reference the upstream registry

2021-05-24 Thread Willian Rampazzo 
On Thu, May 20, 2021 at 2:43 PM Alex Bennée  wrote:
>
> 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 
> ---
>  .gitlab-ci.d/containers.yml | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>

Reviewed-by: Willian Rampazzo

[PATCH v1 2/8] gitlab: explicitly reference the upstream registry

2021-05-20 Thread Alex Bennée 
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 
---
 .gitlab-ci.d/containers.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index 765408ae27..3fb3c14f06 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.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.20.1