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>

.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 \

.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