From d8edf8e383db716c4837c82cced1ae8d6f220551 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 18 Aug 2020 14:37:27 +0200 Subject: [PATCH] Revert "CI: Disable Panfrost T720/T760 CI" This reverts commit 9ef192c100b4c4520c99a9948bf0cfbd52e363fc. Revert "CI: Disable Panfrost T860 and AMD Stoney tests" This reverts commit 3e447c1ad2d605bb234b43ef63c5d9ce53d9ff37. Signed-off-by: Tomeu Vizoso Reviewed-by: Alyssa Rosenzweig Part-of: --- .gitlab-ci/lava-gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 6523d5271ef..d5a51ce41d2 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -149,7 +149,7 @@ kernel+rootfs_armhf: extends: - .lava-test:arm64 -.panfrost-t720-gles2:arm64: +panfrost-t720-gles2:arm64: extends: - .lava-test:arm64 - .panfrost-rules @@ -161,7 +161,7 @@ kernel+rootfs_armhf: tags: - mesa-ci-aarch64-lava-collabora -.panfrost-t760-gles2:armhf: +panfrost-t760-gles2:armhf: extends: - .lava-test:armhf - .panfrost-rules @@ -201,14 +201,14 @@ kernel+rootfs_armhf: 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 @@ -217,7 +217,7 @@ kernel+rootfs_armhf: 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-traces:arm64 - .lava-rk3399-gru-kevin @@ -286,7 +286,7 @@ kernel+rootfs_armhf: tags: - mesa-ci-aarch64-lava-collabora -.radeonsi-stoney-traces:amd64: +radeonsi-stoney-traces:amd64: extends: - .lava-traces:amd64 - .radeonsi-rules -- 2.30.2