ci: Switch the baremetal runner to be an x86 docker image.
The runner is an x86 system, so running the ARM image meant doing
everything at runtime under qemu, and for the xz of the test rootfs that
was quite expensive. Also, we can rebuild x86 images much faster than we
can rebuild arm images for container development, which will help unblock
some of the other feature parity work I have to do versus the old docker
system that cheza is using.
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5033>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e1ff7d..3364909 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -186,6 +186,20 @@
needs:
- arm_build
+# x86 image with ARM rootfses for baremetal testing.
+x86_cross_arm_test:
+ extends: x86_build
+ variables:
+ FDO_DISTRIBUTION_TAG: &x86_cross_arm_test "2020-05-13"
+
+.use-x86_cross_arm_test:
+ variables:
+ TAG: *x86_cross_arm_test
+ image: "$CI_REGISTRY_IMAGE/debian/x86_cross_arm_test:$TAG"
+ needs:
+ - x86_cross_arm_test
+
+
# Debian 10 based ARM test image
arm_test:
extends: arm_build
@@ -822,7 +836,7 @@
arm64_a306_gles2:
extends:
- .baremetal-test
- - .use-arm_build
+ - .use-x86_cross_arm_test
- .freedreno-rules
variables:
BM_KERNEL: /lava-files/Image.gz
@@ -838,6 +852,8 @@
script:
- .gitlab-ci/bare-metal/fastboot.sh
needs:
+ - x86_cross_arm_test
+ - arm_build
- meson-arm64
tags:
- google-freedreno-db410c