From aea8c9c7b1fb329a7f7d43182c054bf3b67232f3 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 3 Mar 2020 11:44:45 -0800 Subject: [PATCH] ci: Flip db410c back to docker mode. Turns out there's corporate policy to not deploy AGPL software, so I have to take down the LAVA lab until we sort out how to do it without a local server. Reviewed-by: Daniel Stone Tested-by: Marge Bot Part-of: --- .gitlab-ci.yml | 8 ++++++++ .gitlab-ci/lava-gitlab-ci.yml | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13b544b8b12..94fa8830169 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -686,6 +686,14 @@ arm64_a630_gles3: variables: DEQP_VER: gles3 +arm64_a306_gles2: + extends: arm64_a630_gles2 + variables: + DEQP_EXPECTED_FAILS: deqp-freedreno-a307-fails.txt + DEQP_SKIPS: deqp-default-skips.txt + tags: + - db410c + # RADV CI .test-radv: variables: diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 6380b4ac6e1..64d84ada31d 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -140,7 +140,7 @@ lima-mali450-test:arm64: tags: - lava-meson-gxl-s905x-libretech-cc -freedreno-a307-gles2: +.freedreno-a307-gles2: extends: .lava-test:arm64 variables: DEVICE_TYPE: apq8016-sbc @@ -153,6 +153,6 @@ freedreno-a307-gles2: .freedreno-a307-gles3: parallel: 6 - extends: freedreno-a307-gles2 + extends: .freedreno-a307-gles2 variables: DEQP_VERSION: gles3 -- 2.30.2