ci: Rename x86_cross_arm_test to just arm_test.

This gets us back to the behavior we used to have for freedreno: clicking
play on arm_test gets you testing of the ARM platforms that aren't under
arm-build (the LAVA runners).

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5247>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0633e74..028054f 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -205,17 +205,17 @@ arm_build:
     - arm_build
 
 # x86 image with ARM rootfses for baremetal testing.
-x86_cross_arm_test:
+arm_test:
   extends: x86_build
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_cross_arm_test "2020-05-28-cheza-2"
+    FDO_DISTRIBUTION_TAG: &arm_test "2020-05-28-cheza-2"
 
-.use-x86_cross_arm_test:
+.use-arm_test:
   variables:
-    TAG: *x86_cross_arm_test
-  image: "$CI_REGISTRY_IMAGE/debian/x86_cross_arm_test:$TAG"
+    TAG: *arm_test
+  image: "$CI_REGISTRY_IMAGE/debian/arm_test:$TAG"
   needs:
-    - x86_cross_arm_test
+    - arm_test
 
 # Native Windows docker builds
 # 
@@ -866,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
@@ -885,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:

diff --git a/.gitlab-ci/container/x86_cross_arm_test.sh b/.gitlab-ci/container/arm_test.sh
similarity index 100%
rename from .gitlab-ci/container/x86_cross_arm_test.sh
rename to .gitlab-ci/container/arm_test.sh