X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=028054fe01286ff5e1da46479058d43a239b45a4;hb=ec8665615f4b4bd019ea56fb1dd2be3716802b78;hp=c5b2e4eab67b844ab7462a53ef4057cab76c80d1;hpb=6f4fc4ff71524d55f6b481e4580c377d3c5f3b66;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c5b2e4eab67..028054fe012 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -205,32 +205,16 @@ arm_build:
     - 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-28-cheza-2"
-
-.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
+  extends: x86_build
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_test "2020-03-18-jflags"
+    FDO_DISTRIBUTION_TAG: &arm_test "2020-05-28-cheza-2"
 
 .use-arm_test:
   variables:
     TAG: *arm_test
   image: "$CI_REGISTRY_IMAGE/debian/arm_test:$TAG"
   needs:
-    - arm_build
-    - meson-arm64
     - arm_test
 
 # Native Windows docker builds
@@ -882,7 +866,7 @@ arm64_a630_gmem:
 arm64_a306_gles2:
   extends:
     - .baremetal-test
-    - .use-x86_cross_arm_test
+    - .use-arm_test
     - .freedreno-rules
   variables:
     BM_KERNEL: /lava-files/Image.gz
@@ -901,7 +885,7 @@ arm64_a306_gles2:
   script:
     - .gitlab-ci/bare-metal/fastboot.sh
   needs:
-    - x86_cross_arm_test
+    - arm_test
     - arm_build
     - meson-arm64
   tags: