diff options
| author | David Heidelberg <david.heidelberg@collabora.com> | 2023-02-20 01:52:04 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-03-24 21:58:22 +0000 |
| commit | 2314a0d59b16e898c9619a17d3b17dd07d1abccd (patch) | |
| tree | 0c1e173ca3cfa834220c9c55ba7b06a75085b3e1 /.gitlab-ci | |
| parent | 8e5c33f8a221918bc08bb669c0411bfe9f7f91f0 (diff) | |
ci: rename .lava-test to .lava-test-deqp to describe it correctly
.lava-test hidden job was setting the HWCI_TEST_SCRIPT variable to deqp
runner. But that is not always the case. When we run piglit traces jobs,
we use piglit-traces.sh instead, for example.
Splitting into:
- .lava-test-deqp (deqp-runner + deqp)
- .lava-traces (deqp-runner + piglit)
- .lava-piglit (piglit-runner + piglit)
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Co-authored-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22065>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/lava/lava-gitlab-ci.yml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index 2f7c46ce35b..61b6707ed2d 100755 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -33,7 +33,7 @@ after_script: - curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -s "https://${JOB_RESULTS_PATH}" | tar --zstd -x -.lava-test:armhf: +.lava-test-deqp:armhf: variables: ARCH: armhf KERNEL_IMAGE_NAME: zImage @@ -50,7 +50,7 @@ - debian/x86_build - debian-armhf -.lava-test:arm64: +.lava-test-deqp:arm64: variables: ARCH: arm64 KERNEL_IMAGE_NAME: Image @@ -69,13 +69,12 @@ - debian/x86_build - debian-arm64 -.lava-test:amd64: +.lava-test-deqp:amd64: variables: ARCH: amd64 KERNEL_IMAGE_NAME: bzImage KERNEL_IMAGE_TYPE: "zimage" BOOT_METHOD: u-boot - HWCI_TEST_SCRIPT: "/install/deqp-runner.sh" extends: - .use-debian/x86_build-base # for same $MESA_ARTIFACTS_BASE_TAG as in kernel+rootfs_amd64 - .use-debian/x86_build @@ -100,25 +99,25 @@ .lava-piglit-traces:amd64: extends: - - .lava-test:amd64 + - .lava-test-deqp:amd64 - .lava-piglit - .lava-traces-base .lava-piglit-traces:armhf: extends: - - .lava-test:armhf + - .lava-test-deqp:armhf - .lava-piglit - .lava-traces-base .lava-piglit-traces:arm64: extends: - - .lava-test:arm64 + - .lava-test-deqp:arm64 - .lava-piglit - .lava-traces-base .lava-piglit:amd64: extends: - - .lava-test:amd64 + - .lava-test-deqp:amd64 - .lava-piglit .lava-piglit:arm64: |