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

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

2
.gitlab-ci.yml
View File

@ -1293,5 +1293,5 @@ meson-mingw32-x86_64:
.baremetal-deqp-test:
variables:
BARE_METAL_TEST_SCRIPT: "/install/deqp-runner.sh"
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
DEQP_PARALLEL: 0 # Default to number of CPUs

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

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

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

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

10
.gitlab-ci/lava/lava-gitlab-ci.yml
View File

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

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

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

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

@ -23,7 +23,7 @@
extends:
- .vc4-rpi3-test:armhf
variables:
BARE_METAL_TEST_SCRIPT: "/install/deqp-runner.sh"
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
# The vc4s are so slow that it takes about a minute to get through the
# default 500 tests in a group, triggering the serial watchdog.
DEQP_RUNNER_OPTIONS: "--tests-per-group 250"
@ -54,7 +54,7 @@ vc4-rpi3-egl:armhf:
- .vc4-rpi3-test:armhf
- .test-manual
variables:
BARE_METAL_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
BM_POE_TIMEOUT: 180
HWCI_START_XORG: 1
PIGLIT_PLATFORM: mixed_glx_egl
@ -81,7 +81,7 @@ vc4-rpi3-piglit-quick_shader:armhf:
- .v3d-rules
- .use-arm_test
variables:
BARE_METAL_TEST_SCRIPT: "/install/deqp-runner.sh"
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
BM_BOOTFS: /boot/raspberrypi_armhf
BM_POE_TIMEOUT: 300
BM_ROOTFS: /rootfs-armhf
@ -148,7 +148,7 @@ v3d-rpi4-piglit:armhf:
- .v3d-rpi4-test:armhf
parallel: 3
variables:
BARE_METAL_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
HWCI_START_XORG: 1
PIGLIT_PLATFORM: mixed_glx_egl
PIGLIT_PROFILES: all
@ -160,7 +160,7 @@ v3dv-rpi4-vk:arm64:
- .v3dv-rules
parallel: 6
variables:
BARE_METAL_TEST_SCRIPT: "/install/deqp-runner.sh"
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
BM_BOOTFS: /boot/raspberrypi_arm64
BM_POE_TIMEOUT: 300
BM_ROOTFS: /rootfs-arm64

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

@ -29,7 +29,7 @@
extends:
- .piglit-traces-test
variables:
BARE_METAL_TEST_SCRIPT: "/install/piglit/run.sh"
HWCI_TEST_SCRIPT: "/install/piglit/run.sh"
HWCI_START_XORG: 1
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-freedreno.yml"
artifacts:
@ -119,7 +119,7 @@ a530_gles31:
- .piglit-test
- .a530-test
variables:
BARE_METAL_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
HWCI_START_XORG: 1
# piglit_gl since it takes a bit under 20 minutes and has a lot of flakes, so
@ -194,14 +194,14 @@ a630_egl:
variables:
DEQP_VER: egl
HWCI_START_XORG: 1
BARE_METAL_TEST_SCRIPT: "/install/bare-metal/arm64_a630_egl.sh"
HWCI_TEST_SCRIPT: "/install/bare-metal/arm64_a630_egl.sh"
a630_gles_others:
extends:
- .baremetal-deqp-test
- .a630-test
variables:
BARE_METAL_TEST_SCRIPT: "/install/bare-metal/arm64_a630_gles_others.sh"
HWCI_TEST_SCRIPT: "/install/bare-metal/arm64_a630_gles_others.sh"
a630_gles_asan:
extends:
@ -262,7 +262,7 @@ a630_piglit:
- .piglit-test
- .a630-test
variables:
BARE_METAL_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
HWCI_START_XORG: 1
PIGLIT_PROFILES: gpu