ci: Unify {BARE_METAL,LAVA}_TEST_SCRIPT environment

Should also probably never have been different.

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>

4 files changed, 10 insertions, 11 deletions

diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index b2f65a14219..019551326c2 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -2,7 +2,6 @@
 
 for var in \
     ASAN_OPTIONS \
-    BARE_METAL_TEST_SCRIPT \
     BASE_SYSTEM_FORK_HOST_PREFIX \
     BASE_SYSTEM_MAINLINE_HOST_PREFIX \
     CI_COMMIT_BRANCH \
@@ -44,11 +43,11 @@ for var in \
     GPU_VERSION \
     HWCI_KERNEL_MODULES \
     HWCI_START_XORG \
+    HWCI_TEST_SCRIPT \
     IR3_SHADER_DEBUG \
     JOB_ARTIFACTS_BASE \
     JOB_RESULTS_PATH \
     JOB_ROOTFS_OVERLAY_PATH \
-    LAVA_TEST_SCRIPT \
     MESA_BUILD_PATH \
     MESA_GL_VERSION_OVERRIDE \
     MESA_GLSL_VERSION_OVERRIDE \
diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh
index 8d3588fe7d4..a1cea3fbee6 100755
--- a/.gitlab-ci/common/init-stage2.sh
+++ b/.gitlab-ci/common/init-stage2.sh
@@ -27,7 +27,7 @@ export PYTHONPATH=$(python3 -c "import sys;print(\":\".join(sys.path))")
 ./capture-devcoredump.sh &
 
 # If we want Xorg to be running for the test, then we start it up before the
-# BARE_METAL_TEST_SCRIPT because we need to use xinit to start X (otherwise
+# HWCI_TEST_SCRIPT because we need to use xinit to start X (otherwise
 # without using -displayfd you can race with Xorg's startup), but xinit will eat
 # your client's return code
 if [ -n "$HWCI_START_XORG" ]; then
@@ -46,7 +46,7 @@ if [ -n "$HWCI_START_XORG" ]; then
 fi
 
 RESULT=fail
-if sh $BARE_METAL_TEST_SCRIPT; then
+if sh $HWCI_TEST_SCRIPT; then
   RESULT=pass
 fi
 
diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml
index 93bd5935372..b3d092bda71 100755
--- a/.gitlab-ci/lava/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava/lava-gitlab-ci.yml
@@ -37,7 +37,7 @@
     KERNEL_IMAGE_NAME: zImage
     KERNEL_IMAGE_TYPE: "type:\ zimage"
     BOOT_METHOD: u-boot
-    LAVA_TEST_SCRIPT: "/install/deqp-runner.sh"
+    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
   extends:
     - .use-arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_armhf
     - .use-x86_build
@@ -54,7 +54,7 @@
     KERNEL_IMAGE_NAME: Image
     KERNEL_IMAGE_TYPE: "type:\ image"
     BOOT_METHOD: u-boot
-    LAVA_TEST_SCRIPT: "/install/deqp-runner.sh"
+    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
   extends:
     - .use-arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_arm64
     - .use-x86_build
@@ -73,7 +73,7 @@
     KERNEL_IMAGE_NAME: bzImage
     KERNEL_IMAGE_TYPE: "type:\ zimage"
     BOOT_METHOD: u-boot
-    LAVA_TEST_SCRIPT: "/install/deqp-runner.sh"
+    HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
   extends:
     - .use-x86_build-base # for same $MESA_ARTIFACTS_BASE_TAG as in kernel+rootfs_amd64
     - .use-x86_build
@@ -85,7 +85,7 @@
 
 .lava-traces-base:
   variables:
-    LAVA_TEST_SCRIPT: "/install/piglit/run.sh"
+    HWCI_TEST_SCRIPT: "/install/piglit/run.sh"
   artifacts:
     reports:
       junit: results/junit.xml
@@ -94,7 +94,7 @@
   variables:
     PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}"
     PIGLIT_RESULTS: "${GPU_VERSION}-${PIGLIT_PROFILES}"
-    LAVA_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
+    HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
 
 .lava-piglit-traces:amd64:
   extends:
diff --git a/.gitlab-ci/lava/lava.yml.jinja2 b/.gitlab-ci/lava/lava.yml.jinja2
index 58c67aae012..ade66ad1cf2 100644
--- a/.gitlab-ci/lava/lava.yml.jinja2
+++ b/.gitlab-ci/lava/lava.yml.jinja2
@@ -113,7 +113,7 @@ actions:
           - export LIBGL_DRIVERS_PATH=/install/lib/dri
 
           # If we want Xorg to be running for the test, then we start it up before the
-          # LAVA_TEST_SCRIPT because we need to use xinit to start X (otherwise
+          # HWCI_TEST_SCRIPT because we need to use xinit to start X (otherwise
           # without using -displayfd you can race with Xorg's startup), but xinit will eat
           # your client's return code
           - "if [ -n $HWCI_START_XORG ]; then
@@ -129,7 +129,7 @@ actions:
              fi"
 
           - "export RESULT=fail;
-	     if sh $LAVA_TEST_SCRIPT; then
+	     if sh $HWCI_TEST_SCRIPT; then
                   export RESULT=pass;
              fi"