Mesa (main): ci/bare-metal: switch to common .baremetal-test-arm64

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: a0634a3c856c81c72b221021d655b98d3112bc2b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a0634a3c856c81c72b221021d655b98d3112bc2b

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Wed Nov 10 15:55:53 2021 +0100

ci/bare-metal: switch to common .baremetal-test-arm64

Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13751>

---

 src/broadcom/ci/gitlab-ci.yml  | 4 +---
 src/freedreno/ci/gitlab-ci.yml | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index 1bdc4e8874e..8c0867c229c 100644
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -108,7 +108,7 @@ v3d-rpi4-piglit:armhf:
 
 v3dv-rpi4-vk:arm64:
   extends:
-    - .baremetal-test
+    - .baremetal-test-arm64
     - .use-debian/arm_test
     - .v3dv-rules
   parallel: 8
@@ -116,14 +116,12 @@ v3dv-rpi4-vk:arm64:
     HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
     BM_BOOTFS: /boot/raspberrypi_arm64
     BM_POE_TIMEOUT: 300
-    BM_ROOTFS: /rootfs-arm64
     DEQP_EXPECTED_RENDERER: "V3D.4.2"
     DEQP_FRACTION: 5
     DEQP_VER: vk
     FLAKES_CHANNEL: "#videocore-ci"
     GPU_VERSION: v3dv-rpi4
     HWCI_KERNEL_MODULES: v3d,vc4
-    MINIO_ARTIFACT_NAME: mesa-arm64
     VK_DRIVER: broadcom
   script:
     - ./install/bare-metal/poe-powered.sh
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 6a2d17a8ce2..e5c459bda37 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -1,11 +1,9 @@
 .freedreno-test:
   extends:
-    - .baremetal-test
+    - .baremetal-test-arm64
     - .use-debian/arm_test
     - .freedreno-rules
   variables:
-    MINIO_ARTIFACT_NAME: mesa-arm64
-    BM_ROOTFS: /rootfs-arm64
     FLAKES_CHANNEL: "#freedreno-ci"
     PIGLIT_PLATFORM: mixed_glx_egl
     BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 $BM_KERNEL_EXTRA_ARGS root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init $BM_KERNELARGS"