From 84767a5160955597f49ad4dc868a347175cc1a9c Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sat, 4 Mar 2023 14:46:01 +0100 Subject: [PATCH] ci/lava: every LAVA job doesn't want to run gles2 deqp, drop it Very annoying when adding new job and not getting failure due to missing `DEQP_VER: ` Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/lava/lava-gitlab-ci.yml | 1 - src/freedreno/ci/gitlab-ci.yml | 2 ++ src/panfrost/ci/gitlab-ci.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index f0b6e31..2f7c46c 100755 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava/lava-gitlab-ci.yml @@ -4,7 +4,6 @@ variables: GIT_STRATEGY: none # testing doesn't build anything from source FDO_CI_CONCURRENT: 6 # should be replaced by per-machine definitions - DEQP_VER: gles2 # proxy used to cache data locally FDO_HTTP_CACHE_URI: "http://caching-proxy/cache/?uri=" # base system generated by the container build job, shared between many pipelines diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml index 8584ea0..cd971e7 100644 --- a/src/freedreno/ci/gitlab-ci.yml +++ b/src/freedreno/ci/gitlab-ci.yml @@ -215,6 +215,7 @@ a618_skqp: HWCI_START_XORG: 1 DEQP_SUITE: freedreno-a618-skqp +# FIXME: this job runs gles2 deqp, rename or fix! a618_piglit: extends: - .piglit-test @@ -225,6 +226,7 @@ a618_piglit: - .freedreno-turnip-rules variables: HWCI_START_XORG: 1 + DEQP_VER: gles2 PIGLIT_PROFILES: gpu .a630-test: diff --git a/src/panfrost/ci/gitlab-ci.yml b/src/panfrost/ci/gitlab-ci.yml index d3f326d..7e29a52 100644 --- a/src/panfrost/ci/gitlab-ci.yml +++ b/src/panfrost/ci/gitlab-ci.yml @@ -130,6 +130,7 @@ panfrost-g52-piglit-gles2:arm64: - .lava-meson-g12b-a311d-khadas-vim3 variables: HWCI_START_XORG: 1 + DEQP_VER: gles2 PIGLIT_PROFILES: quick_gl .lava-mt8183-kukui-jacuzzi-juniper-sku16: -- 2.7.4