ci: use separate docker images for baremetal builds
Using arm_test-base as a separate base layer as well for storage &
network bandwidth efficiency.
Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5381>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a57ddf..00f5516 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -274,7 +274,7 @@
- .fdo.container-build@debian
- .container
variables:
- FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-07"
+ FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-08"
.use-arm_test-base:
extends:
@@ -287,19 +287,19 @@
needs:
- arm_test-base
-# x86 image with ARM rootfses for baremetal testing.
-arm_test:
+# x86 image with ARM64 rootfs for baremetal testing.
+arm64_test:
extends:
- .use-arm_test-base
variables:
- FDO_DISTRIBUTION_TAG: &arm_test "2020-06-07"
+ FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-08"
-.use-arm_test:
+.use-arm64_test:
variables:
- TAG: *arm_test
- image: "$CI_REGISTRY_IMAGE/debian/arm_test:$TAG"
+ TAG: *arm64_test
+ image: "$CI_REGISTRY_IMAGE/debian/arm64_test:$TAG"
needs:
- - arm_test
+ - arm64_test
# Native Windows docker builds
#
@@ -945,7 +945,7 @@
arm64_a306_gles2:
extends:
- .baremetal-test
- - .use-arm_test
+ - .use-arm64_test
- .freedreno-rules
variables:
BM_KERNEL: /lava-files/Image.gz
@@ -964,7 +964,7 @@
script:
- .gitlab-ci/bare-metal/fastboot.sh
needs:
- - arm_test
+ - arm64_test
- arm_build
- meson-arm64
tags: