[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/7] gitlab-ci: Remove special casing for hexagon testing
From: |
Richard Henderson |
Subject: |
[PATCH 4/7] gitlab-ci: Remove special casing for hexagon testing |
Date: |
Thu, 14 Oct 2021 15:44:32 -0700 |
Now that the hexagon container is using a pre-built
toolchain, we do not need to make the build optional.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
.gitlab-ci.d/buildtest.yml | 4 ----
.gitlab-ci.d/container-cross.yml | 27 +++------------------------
2 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 5c378e35f9..27b9b6be6b 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -249,14 +249,10 @@ build-user-static:
CONFIGURE_ARGS: --disable-tools --disable-system --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 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
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index a3b5b90552..ed7a849a69 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -47,33 +47,12 @@ 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
+ extends: .container_job_template
+ stage: containers-layer2
+ needs: ['amd64-debian10-container']
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
--
2.25.1
- [PATCH 0/7] tests: docker images for hexagon, nios2, microblaze, Richard Henderson, 2021/10/14
- [PATCH 3/7] tests/docker: Update debian-hexagon-cross to a newer toolchain, Richard Henderson, 2021/10/14
- [PATCH 4/7] gitlab-ci: Remove special casing for hexagon testing,
Richard Henderson <=
- [PATCH 7/7] tests/tcg: Enable container_cross_cc for microblaze, Richard Henderson, 2021/10/14
- [PATCH 6/7] tests/docker: Add debian-microblaze-cross image, Richard Henderson, 2021/10/14
- [PATCH 5/7] tests/docker: Add debian-nios2-cross image, Richard Henderson, 2021/10/14
- Re: [PATCH 0/7] tests: docker images for hexagon, nios2, microblaze, Alex Bennée, 2021/10/19