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

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: