ci: Unify {BM,LAVA}_START_XORG environment

Why were they ever 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

@@ -5,7 +5,6 @@ for var in \
     BARE_METAL_TEST_SCRIPT \
     BASE_SYSTEM_FORK_HOST_PREFIX \
     BASE_SYSTEM_MAINLINE_HOST_PREFIX \
-    BM_START_XORG \
     CI_COMMIT_BRANCH \
     CI_COMMIT_TITLE \
     CI_JOB_ID \
@@ -44,11 +43,11 @@ for var in \
     FLAKES_CHANNEL \
     GPU_VERSION \
     HWCI_KERNEL_MODULES \
+    HWCI_START_XORG \
     IR3_SHADER_DEBUG \
     JOB_ARTIFACTS_BASE \
     JOB_RESULTS_PATH \
     JOB_ROOTFS_OVERLAY_PATH \
-    LAVA_START_XORG \
     LAVA_TEST_SCRIPT \
     MESA_BUILD_PATH \
     MESA_GL_VERSION_OVERRIDE \

.gitlab-ci/common/init-stage2.sh

@@ -30,7 +30,7 @@ export PYTHONPATH=$(python3 -c "import sys;print(\":\".join(sys.path))")
 # BARE_METAL_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 "$BM_START_XORG" ]; then
+if [ -n "$HWCI_START_XORG" ]; then
   echo "touch /xorg-started; sleep 100000" > /xorg-script
   env \
     xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log &