Module: Mesa Branch: main Commit: bc5a48d48b1e56b687e703529eb300c51ac8036b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc5a48d48b1e56b687e703529eb300c51ac8036b
Author: David Heidelberg <[email protected]> Date: Mon Feb 20 01:55:17 2023 +0100 ci: create lava-test without deqp HWCI_TEST_SCRIPT Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22065> --- .gitlab-ci/lava/lava-gitlab-ci.yml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index 61b6707ed2d..a41b77a75c2 100755 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -33,13 +33,12 @@ after_script: - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -s "https://${JOB_RESULTS_PATH}"; | tar --zstd -x -.lava-test-deqp:armhf: +.lava-test:armhf: variables: ARCH: armhf KERNEL_IMAGE_NAME: zImage KERNEL_IMAGE_TYPE: "zimage" BOOT_METHOD: u-boot - HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" extends: - .use-debian/arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_armhf - .use-debian/x86_build @@ -50,13 +49,18 @@ - debian/x86_build - debian-armhf -.lava-test-deqp:arm64: +.lava-test-deqp:armhf: + extends: + - .lava-test:armhf + variables: + HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" + +.lava-test:arm64: variables: ARCH: arm64 KERNEL_IMAGE_NAME: Image KERNEL_IMAGE_TYPE: "image" BOOT_METHOD: u-boot - HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" extends: - .use-debian/arm_build # for same $MESA_ARTIFACTS_TAG as in kernel+rootfs_arm64 - .use-debian/x86_build @@ -69,7 +73,13 @@ - debian/x86_build - debian-arm64 -.lava-test-deqp:amd64: +.lava-test-deqp:arm64: + variables: + HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" + extends: + - .lava-test:arm64 + +.lava-test:amd64: variables: ARCH: amd64 KERNEL_IMAGE_NAME: bzImage @@ -84,6 +94,12 @@ - kernel+rootfs_amd64 - debian-testing +.lava-test-deqp:amd64: + variables: + HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" + extends: + - .lava-test:amd64 + .lava-traces-base: variables: HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
