summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorAlex Bennée2021-05-20 19:42:58 +0200
committerAlex Bennée2021-05-25 17:52:44 +0200
commit1aab5f053655882fa84df203df5f57599829cd48 (patch)
tree9e231cc2441a9b4a5206dc8d206ae4da2d527fd4 /.gitlab-ci.yml
parentgitlab: explicitly reference the upstream registry (diff)
downloadqemu-1aab5f053655882fa84df203df5f57599829cd48.tar.gz
qemu-1aab5f053655882fa84df203df5f57599829cd48.tar.xz
qemu-1aab5f053655882fa84df203df5f57599829cd48.zip
gitlab: add special rule for the hexagon container
The hexagon container is always manually built but of course not everyone will be building it themselves and pushing to their registries. We still need to create a "local" registry copy for the actual gitlab tests to run. We don't build it in this case, just pull it across from the upstream registry. We disable this rule from running on the qemu-project itself so it doesn't accidentally wipe out our master copy. Fixes: 910c40ee94 ("gitlab: add build-user-hexagon test") Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Tested-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Willian Rampazzo <willianr@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Cc: Cornelia Huck <cohuck@redhat.com> Message-Id: <20210520174303.12310-4-alex.bennee@linaro.org>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml5
1 files changed, 4 insertions, 1 deletions
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