diff options
| author | Daniel Stone <daniels@collabora.com> | 2021-06-11 16:46:57 +0100 |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2021-06-15 14:02:44 +0200 |
| commit | 0d6dd44818d583e31519422a3f64da86784f71c2 (patch) | |
| tree | a9c36ac1017e2aba23b0650d53a9aca32bbb74f9 /.gitlab-ci | |
| parent | 5f32d2a438f063ef4f82c0cd441f3e88cbab990e (diff) | |
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>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/common/generate-env.sh | 3 | ||||
| -rwxr-xr-x | .gitlab-ci/common/init-stage2.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/lava/lava.yml.jinja2 | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh index 4a169018b09..b2f65a14219 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_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 \ diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh index 346574d8654..8d3588fe7d4 100755 --- a/.gitlab-ci/common/init-stage2.sh +++ b/.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 & diff --git a/.gitlab-ci/lava/lava.yml.jinja2 b/.gitlab-ci/lava/lava.yml.jinja2 index 585263ab414..58c67aae012 100644 --- a/.gitlab-ci/lava/lava.yml.jinja2 +++ b/.gitlab-ci/lava/lava.yml.jinja2 @@ -116,7 +116,7 @@ actions: # LAVA_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 $LAVA_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 & for i in 1 2 3 4 5; do |