From 573c8196e46ebd589c79a47d1afdb00aacde3210 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 23 Mar 2021 09:19:24 +0100 Subject: [PATCH] Revert "ci/panfrost: Disable t860/radeonsi testing while the runners are struggling." Infrastructure should be more stable now. This reverts commit 0a1c533c6e5ede82f33ac269fcb6bba8e0777262. Signed-off-by: Tomeu Vizoso Acked-by: Daniel Stone Part-of: --- src/gallium/drivers/panfrost/ci/gitlab-ci.yml | 6 +++--- src/gallium/drivers/radeonsi/ci/gitlab-ci.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml index 2aeb0ed8c67..d1ddc6f68e6 100644 --- a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml +++ b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml @@ -52,14 +52,14 @@ panfrost-t720-gles2:arm64: tags: - mesa-ci-aarch64-lava-collabora -.panfrost-t860-gles2:arm64: +panfrost-t860-gles2:arm64: extends: - .lava-test:arm64 - .lava-rk3399-gru-kevin variables: ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860" -.panfrost-t860-gles3:arm64: +panfrost-t860-gles3:arm64: parallel: 2 extends: - .lava-test:arm64 @@ -68,7 +68,7 @@ panfrost-t720-gles2:arm64: DEQP_VERSION: gles3 ENV_VARS: "PAN_MESA_DEBUG=gles3 DEQP_PARALLEL=6 DEQP_EXPECTED_RENDERER=T860" -.panfrost-t860-traces:arm64: +panfrost-t860-traces:arm64: extends: - .lava-piglit-traces:arm64 - .lava-rk3399-gru-kevin diff --git a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml index b9bd2b547a1..a17f4d46ab3 100644 --- a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml +++ b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml @@ -22,7 +22,7 @@ tags: - mesa-ci-aarch64-lava-collabora -.radeonsi-stoney-gles31:amd64: +radeonsi-stoney-gles31:amd64: extends: - .radeonsi-stoney-gles2:amd64 variables: @@ -32,7 +32,7 @@ tags: - mesa-ci-aarch64-lava-collabora -.radeonsi-stoney-traces:amd64: +radeonsi-stoney-traces:amd64: extends: - .lava-piglit-traces:amd64 - .radeonsi-rules