From b04e826e33941ff232ce302d9ab773ac46e8a08b Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Fri, 11 Jun 2021 15:40:08 +0100
Subject: [PATCH] ci/bare-metal: Rename BM_KERNEL_MODULES to
 HWCI_KERNEL_MODULES

To try to make init more common.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Acked-by: Martin Peres <martin.peres@mupuf.org>
Acked-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11337>
---
 .gitlab-ci/bare-metal/init.sh     | 2 +-
 .gitlab-ci/common/generate-env.sh | 2 +-
 src/broadcom/ci/gitlab-ci.yml     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci/bare-metal/init.sh b/.gitlab-ci/bare-metal/init.sh
index 15429f662d0..60e12c4b14e 100755
--- a/.gitlab-ci/bare-metal/init.sh
+++ b/.gitlab-ci/bare-metal/init.sh
@@ -11,7 +11,7 @@ mount -t tmpfs tmpfs /tmp
 
 . /set-job-env-vars.sh
 
-[ -z "$BM_KERNEL_MODULES" ] || echo -n $BM_KERNEL_MODULES | xargs -d, -n1 /usr/sbin/modprobe
+[ -z "$HWCI_KERNEL_MODULES" ] || echo -n $HWCI_KERNEL_MODULES | xargs -d, -n1 /usr/sbin/modprobe
 
 # Store Mesa's disk cache under /tmp, rather than sending it out over NFS.
 export XDG_CACHE_HOME=/tmp
diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index 602f6bbca5b..4a169018b09 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -5,7 +5,6 @@ for var in \
     BARE_METAL_TEST_SCRIPT \
     BASE_SYSTEM_FORK_HOST_PREFIX \
     BASE_SYSTEM_MAINLINE_HOST_PREFIX \
-    BM_KERNEL_MODULES \
     BM_START_XORG \
     CI_COMMIT_BRANCH \
     CI_COMMIT_TITLE \
@@ -44,6 +43,7 @@ for var in \
     FD_MESA_DEBUG \
     FLAKES_CHANNEL \
     GPU_VERSION \
+    HWCI_KERNEL_MODULES \
     IR3_SHADER_DEBUG \
     JOB_ARTIFACTS_BASE \
     JOB_RESULTS_PATH \
diff --git a/src/broadcom/ci/gitlab-ci.yml b/src/broadcom/ci/gitlab-ci.yml
index 1350b1c2f0c..883100d2bb8 100644
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -5,10 +5,10 @@
     - .use-arm_test
   variables:
     BM_BOOTFS: /boot/raspberrypi_armhf
-    BM_KERNEL_MODULES: vc4
     BM_ROOTFS: /rootfs-armhf
-    GPU_VERSION: vc4-rpi3
     DEQP_EXPECTED_RENDERER: VC4
+    GPU_VERSION: vc4-rpi3
+    HWCI_KERNEL_MODULES: vc4
     FLAKES_CHANNEL: "#videocore-ci"
   script:
     - ./install/bare-metal/poe-powered.sh
@@ -83,12 +83,12 @@ vc4-rpi3-piglit-quick_shader:armhf:
   variables:
     BARE_METAL_TEST_SCRIPT: "/install/deqp-runner.sh"
     BM_BOOTFS: /boot/raspberrypi_armhf
-    BM_KERNEL_MODULES: v3d,vc4
     BM_POE_TIMEOUT: 300
     BM_ROOTFS: /rootfs-armhf
     DEQP_EXPECTED_RENDERER: V3D
     FLAKES_CHANNEL: "#videocore-ci"
     GPU_VERSION: v3d-rpi4
+    HWCI_KERNEL_MODULES: v3d,vc4
   script:
     - ./install/bare-metal/poe-powered.sh
   needs:
@@ -162,7 +162,6 @@ v3dv-rpi4-vk:arm64:
   variables:
     BARE_METAL_TEST_SCRIPT: "/install/deqp-runner.sh"
     BM_BOOTFS: /boot/raspberrypi_arm64
-    BM_KERNEL_MODULES: v3d,vc4
     BM_POE_TIMEOUT: 300
     BM_ROOTFS: /rootfs-arm64
     DEQP_EXPECTED_RENDERER: "V3D 4.2"
@@ -170,6 +169,7 @@ v3dv-rpi4-vk:arm64:
     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: