X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=33649095cba03b852837f5f3de6ab8a3c638b388;hb=15d6d354207adea208377edbafe9ca8180a9e406;hp=863d0ec9864f45b99fda19118f07b9ce603df7e0;hpb=188916bd060e09fbbc1b3911516cd1f49b0291fd;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 863d0ec9864..33649095cba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,7 +136,7 @@ x86_build:
     - .fdo.container-build@debian
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_build "2020-05-18-baremetal"
+    FDO_DISTRIBUTION_TAG: &x86_build "2020-05-18-baremetal-2"
 
 .use-x86_build:
   variables:
@@ -177,7 +177,7 @@ arm_build:
     - .fdo.container-build@debian@arm64v8
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_build "2020-05-14-baremetal"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-05-14-baremetal-5"
 
 .use-arm_build:
   variables:
@@ -186,6 +186,20 @@ arm_build:
   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_a630_gles31_options:
 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 @@ arm64_a306_gles2:
   script:
     - .gitlab-ci/bare-metal/fastboot.sh
   needs:
+    - x86_cross_arm_test
+    - arm_build
     - meson-arm64
   tags:
     - google-freedreno-db410c