KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Daniel Stone 2021-06-11 16:46:57 +01:00 committed by Tomeu Vizoso
parent 5f32d2a438
commit 0d6dd44818
7 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci/common/generate-env.sh
View File

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

2
.gitlab-ci/common/init-stage2.sh
View File

@ -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 &

2
.gitlab-ci/lava/lava.yml.jinja2
View File

@ -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

8
src/broadcom/ci/gitlab-ci.yml
View File

@ -45,7 +45,7 @@ vc4-rpi3-egl:armhf:
extends:
- .vc4-rpi3-deqp:armhf
variables:
BM_START_XORG: 1
HWCI_START_XORG: 1
DEQP_VER: egl
.vc4-rpi3-piglit:armhf:
@ -56,7 +56,7 @@ vc4-rpi3-egl:armhf:
variables:
BARE_METAL_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
BM_POE_TIMEOUT: 180
BM_START_XORG: 1
HWCI_START_XORG: 1
PIGLIT_PLATFORM: mixed_glx_egl
vc4-rpi3-piglit-quick_gl:armhf:
@ -139,7 +139,7 @@ v3d-rpi4-egl:armhf:
extends:
- .v3d-rpi4-test:armhf
variables:
BM_START_XORG: 1
HWCI_START_XORG: 1
DEQP_VER: egl
v3d-rpi4-piglit:armhf:
@ -149,7 +149,7 @@ v3d-rpi4-piglit:armhf:
parallel: 3
variables:
BARE_METAL_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
BM_START_XORG: 1
HWCI_START_XORG: 1
PIGLIT_PLATFORM: mixed_glx_egl
PIGLIT_PROFILES: all

8
src/freedreno/ci/gitlab-ci.yml
View File

@ -30,7 +30,7 @@
- .piglit-traces-test
variables:
BARE_METAL_TEST_SCRIPT: "/install/piglit/run.sh"
BM_START_XORG: 1
HWCI_START_XORG: 1
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-freedreno.yml"
artifacts:
reports:
@ -120,7 +120,7 @@ a530_gles31:
- .a530-test
variables:
BARE_METAL_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
BM_START_XORG: 1
HWCI_START_XORG: 1
# piglit_gl since it takes a bit under 20 minutes and has a lot of flakes, so
# leave it as manual.
@ -193,7 +193,7 @@ a630_egl:
- .a630-test
variables:
DEQP_VER: egl
BM_START_XORG: 1
HWCI_START_XORG: 1
BARE_METAL_TEST_SCRIPT: "/install/bare-metal/arm64_a630_egl.sh"
a630_gles_others:
@ -263,7 +263,7 @@ a630_piglit:
- .a630-test
variables:
BARE_METAL_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
BM_START_XORG: 1
HWCI_START_XORG: 1
PIGLIT_PROFILES: gpu
a630-traces:

8
src/gallium/drivers/iris/ci/gitlab-ci.yml
View File

@ -85,7 +85,7 @@ iris-apl-egl:
- .iris-apl-test
variables:
PIGLIT_NO_WINDOW: 0
LAVA_START_XORG: 1
HWCI_START_XORG: 1
DEQP_VER: egl
iris-glk-gles2:
@ -124,7 +124,7 @@ iris-glk-egl:
- .iris-glk-test
variables:
PIGLIT_NO_WINDOW: 0
LAVA_START_XORG: 1
HWCI_START_XORG: 1
DEQP_VER: egl
iris-amly-gles2:
@ -162,7 +162,7 @@ iris-amly-egl:
- .iris-amly-test
variables:
PIGLIT_NO_WINDOW: 0
LAVA_START_XORG: 1
HWCI_START_XORG: 1
DEQP_VER: egl
iris-amly-piglit:
@ -171,11 +171,11 @@ iris-amly-piglit:
- .lava-piglit
parallel: 3
variables:
HWCI_START_XORG: 1
PIGLIT_NO_WINDOW: 0
PIGLIT_PLATFORM: mixed_glx_egl
PIGLIT_PROFILES: gpu
PIGLIT_JUNIT_RESULTS: 1
LAVA_START_XORG: 1
.iris-traces:
extends:

2
src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
View File

@ -71,4 +71,4 @@ radeonsi-stoney-piglit-gl:amd64:
PIGLIT_PLATFORM: mixed_glx_egl
PIGLIT_PROFILES: quick_gl
PIGLIT_JUNIT_RESULTS: 1
LAVA_START_XORG: 1
HWCI_START_XORG: 1