summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorFritz Koenig <frkoenig@google.com>2020-02-12 19:31:24 +0000
committerMarge Bot <eric+marge@anholt.net>2020-02-13 18:13:55 +0000
commit2a98cf3b2ecea43cea148df7f77d2abadfd1c9db (patch)
treebf2b8ff2726ece52cf2e137ddcc801f9eeafafb0 /.gitlab-ci.yml
parent5a82273f09d92a815b1ade0d82d095a9e6b8244e (diff)
Revert "gitlab-ci: disable a630 tests as mesa-cheza is down (again)"
This reverts commit 18657c0c0a9074d3dfc0763b396929bcf34f71b4 Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3804> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3804>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2475c4a7c69..ac2648cfa5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -646,7 +646,7 @@ test-softpipe-gles31:
DEQP_VER: gles31
extends: test-softpipe-gles2
-.arm64_a630_gles2:
+arm64_a630_gles2:
extends:
- .deqp-test-gl
- .use-arm_test
@@ -662,18 +662,18 @@ test-softpipe-gles31:
dependencies:
- meson-arm64
-.arm64_a630_gles31:
- extends: .arm64_a630_gles2
+arm64_a630_gles31:
+ extends: arm64_a630_gles2
variables:
DEQP_VER: gles31
-.arm64_a630_gles3:
- extends: .arm64_a630_gles2
+arm64_a630_gles3:
+ extends: arm64_a630_gles2
variables:
DEQP_VER: gles3
arm64_a306_gles2:
- extends: .arm64_a630_gles2
+ extends: arm64_a630_gles2
variables:
DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt
DEQP_SKIPS: deqp-default-skips.txt