Mesa (main): Revert "CI: Disable LAVA devices"
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jul 22 09:16:00 UTC 2021
Module: Mesa
Branch: main
Commit: d8bfad70dc1666f7ff9f6122acd20b98c4ff5232
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8bfad70dc1666f7ff9f6122acd20b98c4ff5232
Author: Daniel Stone <daniels at collabora.com>
Date: Thu Jul 22 08:40:48 2021 +0100
Revert "CI: Disable LAVA devices"
This reverts commit 1f4ff4ed2e6fbefb5026d8300a80049ccf4912a5.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12016>
---
src/amd/ci/gitlab-ci.yml | 2 +-
src/gallium/drivers/iris/ci/gitlab-ci.yml | 22 +++++++++++-----------
src/gallium/drivers/panfrost/ci/gitlab-ci.yml | 16 ++++++++--------
src/gallium/drivers/radeonsi/ci/gitlab-ci.yml | 10 +++++-----
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index 83897667807..91980cdfbe7 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -55,7 +55,7 @@ radv_polaris10_vkcts:
- polaris10
# Run three jobs in parallel each running 1/30th of the test suite
-.radv_stoney_vkcts:amd64:
+radv_stoney_vkcts:amd64:
extends:
- .lava-test:amd64
- .radv-rules
diff --git a/src/gallium/drivers/iris/ci/gitlab-ci.yml b/src/gallium/drivers/iris/ci/gitlab-ci.yml
index e5783a97764..069a4515ff0 100644
--- a/src/gallium/drivers/iris/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/iris/ci/gitlab-ci.yml
@@ -51,13 +51,13 @@
tags:
- mesa-ci-x86-64-lava-hp-x360-14-G1-sona
-.iris-apl-gles2:
+iris-apl-gles2:
extends:
- .iris-apl-test
variables:
DEQP_VER: gles2
-.iris-apl-gles3:
+iris-apl-gles3:
extends:
- .iris-apl-test
variables:
@@ -65,7 +65,7 @@
DEQP_EXPECTED_RENDERER: APL
DEQP_FRACTION: 4
-.iris-apl-gles31:
+iris-apl-gles31:
extends:
- .iris-apl-test
variables:
@@ -81,7 +81,7 @@ iris-apl-gl:
variables:
DEQP_VER: gl46
-.iris-apl-egl:
+iris-apl-egl:
extends:
- .iris-apl-test
variables:
@@ -89,13 +89,13 @@ iris-apl-gl:
HWCI_START_XORG: 1
DEQP_VER: egl
-.iris-glk-gles2:
+iris-glk-gles2:
extends:
- .iris-glk-test
variables:
DEQP_VER: gles2
-.iris-glk-gles3:
+iris-glk-gles3:
extends:
- .iris-glk-test
variables:
@@ -103,7 +103,7 @@ iris-apl-gl:
DEQP_EXPECTED_RENDERER: GLK
DEQP_FRACTION: 8
-.iris-glk-gles31:
+iris-glk-gles31:
extends:
- .iris-glk-test
variables:
@@ -120,7 +120,7 @@ iris-glk-gl:
variables:
DEQP_VER: gl46
-.iris-glk-egl:
+iris-glk-egl:
extends:
- .iris-glk-test
variables:
@@ -190,14 +190,14 @@ iris-glk-gl:
PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-iris.yml"
PIGLIT_REPLAY_EXTRA_ARGS: --keep-image
-.iris-apl-traces:
+iris-apl-traces:
variables:
GPU_VERSION: intel-apl
extends:
- .iris-apl-test
- .iris-traces
-.iris-glk-traces:
+iris-glk-traces:
variables:
GPU_VERSION: intel-glk
extends:
@@ -211,7 +211,7 @@ iris-glk-gl:
- .iris-amly-test
- .iris-traces
-.iris-kbl-traces:
+iris-kbl-traces:
variables:
GPU_VERSION: intel-kbl
extends:
diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
index c278dd23d50..01f91016200 100644
--- a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
@@ -4,7 +4,7 @@
PAN_MESA_DEBUG: sync
HWCI_FREQ_MAX: "true"
-.panfrost-t720-gles2:arm64:
+panfrost-t720-gles2:arm64:
extends:
- .lava-test:arm64
- .panfrost-midgard-rules
@@ -18,7 +18,7 @@
tags:
- mesa-ci-x86-64-lava-sun50i-h6-pine-h64
-.panfrost-t760-gles2:armhf:
+panfrost-t760-gles2:armhf:
extends:
- .lava-test:armhf
- .panfrost-midgard-rules
@@ -34,7 +34,7 @@
tags:
- mesa-ci-x86-64-lava-rk3288-veyron-jaq
-.panfrost-t760-traces:armhf:
+panfrost-t760-traces:armhf:
extends:
- .lava-piglit-traces:armhf
- .panfrost-midgard-rules
@@ -80,7 +80,7 @@
DEQP_PARALLEL: 6
DEQP_EXPECTED_RENDERER: T860
-.panfrost-t860-gles3:arm64:
+panfrost-t860-gles3:arm64:
parallel: 2
extends:
- .lava-test:arm64
@@ -90,7 +90,7 @@
DEQP_PARALLEL: 6
DEQP_EXPECTED_RENDERER: T860
-.panfrost-t860-gles31:arm64:
+panfrost-t860-gles31:arm64:
extends:
- .lava-test:arm64
- .lava-rk3399-gru-kevin
@@ -103,7 +103,7 @@
DEQP_PARALLEL: 1
DEQP_EXPECTED_RENDERER: T860
-.panfrost-t860-traces:arm64:
+panfrost-t860-traces:arm64:
extends:
- .lava-piglit-traces:arm64
- .lava-rk3399-gru-kevin
@@ -137,7 +137,7 @@
DEQP_PARALLEL: 6
DEQP_EXPECTED_RENDERER: G52
-.panfrost-g52-gles3:arm64:
+panfrost-g52-gles3:arm64:
parallel: 2
extends:
- .lava-test:arm64
@@ -148,7 +148,7 @@
DEQP_PARALLEL: 6
DEQP_EXPECTED_RENDERER: G52
-.panfrost-g52-gles31:arm64:
+panfrost-g52-gles31:arm64:
extends:
- .lava-test:arm64
- .lava-meson-g12b-a311d-khadas-vim3
diff --git a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
index 8a20f5624a5..0d47b11565f 100644
--- a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
@@ -20,14 +20,14 @@
- .lava-test:amd64
- .radeonsi-stoney-test:amd64
-.radeonsi-stoney-gles2:amd64:
+radeonsi-stoney-gles2:amd64:
extends:
- .radeonsi-stoney-deqp:amd64
variables:
DEQP_VER: gles2
# Run two jobs in parallel each running 1/4th of the test suite
-.radeonsi-stoney-gles3:amd64:
+radeonsi-stoney-gles3:amd64:
extends:
- .radeonsi-stoney-deqp:amd64
parallel: 2
@@ -39,7 +39,7 @@
# Run two jobs in parallel each running 1/4th of the test suite
-.radeonsi-stoney-gles31:amd64:
+radeonsi-stoney-gles31:amd64:
extends:
- .radeonsi-stoney-deqp:amd64
parallel: 2
@@ -50,7 +50,7 @@
DEQP_FRACTION: 2
-.radeonsi-stoney-traces:amd64:
+radeonsi-stoney-traces:amd64:
extends:
- .lava-piglit-traces:amd64
- .radeonsi-stoney-test:amd64
@@ -63,7 +63,7 @@
tags:
- mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt
-.radeonsi-stoney-piglit-gl:amd64:
+radeonsi-stoney-piglit-gl:amd64:
extends:
- .lava-piglit:amd64
- .radeonsi-stoney-test:amd64
More information about the mesa-commit
mailing list