diff options
| -rw-r--r-- | .gitlab-ci.d/containers.yml | 28 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 5 |
2 files changed, 32 insertions, 1 deletions
diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 3fb3c14f06..7b7ca3790d 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -101,6 +101,34 @@ armhf-debian-cross-container: variables: NAME: debian-armhf-cross +# We never want to build hexagon in the CI system and by default we +# always want to refer to the master registry where it lives. +hexagon-cross-container: + image: docker:stable + stage: containers + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' + when: never + - when: always + variables: + NAME: debian-hexagon-cross + GIT_DEPTH: 1 + services: + - docker:dind + before_script: + - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" + - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" + - docker info + - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + script: + - echo "TAG:$TAG" + - echo "COMMON_TAG:$COMMON_TAG" + - docker pull $COMMON_TAG + - docker tag $COMMON_TAG $TAG + - docker push "$TAG" + after_script: + - docker logout + hppa-debian-cross-container: extends: .container_job_template stage: containers-layer2 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f718b61fa7..6a0d311cf4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -417,10 +417,13 @@ build-user-static: MAKE_CHECK_ARGS: check-tcg # Because the hexagon cross-compiler takes so long to build we don't rely -# on the CI system to build it and hence this job has no dependency +# on the CI system to build it and hence this job has an optional dependency # declared. The image is manually uploaded. build-user-hexagon: extends: .native_build_job_template + needs: + job: hexagon-cross-container + optional: true variables: IMAGE: debian-hexagon-cross TARGETS: hexagon-linux-user |