[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 14/14] gitlab-ci: do not use qemu-project Docker registry
|
From: |
Alessandro Di Federico |
|
Subject: |
[PATCH v5 14/14] gitlab-ci: do not use qemu-project Docker registry |
|
Date: |
Sat, 19 Jun 2021 11:37:13 +0200 |
From: Alessandro Di Federico <ale@rev.ng>
This commit is necessary in order to use container built by the current
run of the CI. If we don't do this, we use official containers which are
not affected by the additional dependencies we're introducing.
Signed-off-by: Alessandro Di Federico <ale@rev.ng>
---
.gitlab-ci.d/container-cross.yml | 2 +-
.gitlab-ci.d/container-template.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index 0fcebe363a..eb134e927d 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -63,7 +63,7 @@ hexagon-cross-container:
- docker:dind
before_script:
- export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest"
- - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest"
+ - export COMMON_TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest"
- docker info
- docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p
"$CI_REGISTRY_PASSWORD"
script:
diff --git a/.gitlab-ci.d/container-template.yml
b/.gitlab-ci.d/container-template.yml
index 1baecd9460..c85ae377b8 100644
--- a/.gitlab-ci.d/container-template.yml
+++ b/.gitlab-ci.d/container-template.yml
@@ -5,7 +5,7 @@
- docker:dind
before_script:
- export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest"
- - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/$NAME:latest"
+ - export COMMON_TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest"
- apk add python3
- docker info
- docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p
"$CI_REGISTRY_PASSWORD"
@@ -14,7 +14,7 @@
- echo "COMMON_TAG:$COMMON_TAG"
- ./tests/docker/docker.py --engine docker build
-t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker"
- -r $CI_REGISTRY/qemu-project/qemu
+ -r $CI_REGISTRY_IMAGE
- docker tag "qemu/$NAME" "$TAG"
- docker push "$TAG"
after_script:
--
2.31.1
- RE: [PATCH v5 07/14] target/hexagon: expose next PC in DisasContext, (continued)
- [PATCH v5 08/14] target/hexagon: prepare input for the idef-parser, Alessandro Di Federico, 2021/06/19
- [PATCH v5 09/14] target/hexagon: import lexer for idef-parser, Alessandro Di Federico, 2021/06/19
- [PATCH v5 03/14] target/hexagon: import README for idef-parser, Alessandro Di Federico, 2021/06/19
- [PATCH v5 11/14] target/hexagon: call idef-parser functions, Alessandro Di Federico, 2021/06/19
- [PATCH v5 14/14] gitlab-ci: do not use qemu-project Docker registry,
Alessandro Di Federico <=
- [PATCH v5 10/14] target/hexagon: import parser for idef-parser, Alessandro Di Federico, 2021/06/19
- [PATCH v5 13/14] target/hexagon: import additional tests, Alessandro Di Federico, 2021/06/19