From 1fce16d33f64fefd5ff9c35d14a92213e8805831 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Mon, 18 Aug 2025 14:25:28 +0200 Subject: [PATCH] anv/ci: Run full anv-adl-angle job pre-merge We have enough devices to run the full job without a fraction, which also allows deleting the nightly job. Signed-off-by: Valentine Burley Part-of: --- src/intel/ci/deqp-anv-adl-angle-full.toml | 66 ----------------------- src/intel/ci/deqp-anv-adl-angle.toml | 2 - src/intel/ci/gitlab-ci.yml | 10 +--- 3 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 src/intel/ci/deqp-anv-adl-angle-full.toml diff --git a/src/intel/ci/deqp-anv-adl-angle-full.toml b/src/intel/ci/deqp-anv-adl-angle-full.toml deleted file mode 100644 index c585614c2b4..00000000000 --- a/src/intel/ci/deqp-anv-adl-angle-full.toml +++ /dev/null @@ -1,66 +0,0 @@ -# Basic test set -[[deqp]] -deqp = "/deqp-gles/modules/gles2/deqp-gles2" -caselists = ["/deqp-gles/mustpass/gles2-main.txt"] -deqp_args = [ - "--deqp-surface-width=256", "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", - "--deqp-gl-config-name=rgba8888d24s8ms0", -] -version_check = "GL ES 3.2" -renderer_check = "ANGLE.*ADL" - -[[deqp]] -deqp = "/deqp-gles/modules/gles3/deqp-gles3" -caselists = ["/deqp-gles/mustpass/gles3-main.txt"] -deqp_args = [ - "--deqp-surface-width=256", "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", - "--deqp-gl-config-name=rgba8888d24s8ms0", -] - -[[deqp]] -deqp = "/deqp-gles/modules/gles31/deqp-gles31" -caselists = ["/deqp-gles/mustpass/gles31-main.txt"] -deqp_args = [ - "--deqp-surface-width=256", "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", - "--deqp-gl-config-name=rgba8888d24s8ms0", -] - -[[deqp]] -deqp = "/deqp-gles/external/openglcts/modules/glcts" -caselists = [ - "/deqp-gles/mustpass/gles2-khr-main.txt", - "/deqp-gles/mustpass/gles3-khr-main.txt", - "/deqp-gles/mustpass/gles31-khr-main.txt", -] -deqp_args = [ - "--deqp-surface-width=256", "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", - "--deqp-gl-config-name=rgba8888d24s8ms0", -] - -# 565-no-depth-no-stencil: Not supported with angle on X11? - -# multisample -[[deqp]] -deqp = "/deqp-gles/modules/gles3/deqp-gles3" -caselists = ["/deqp-gles/mustpass/gles3-multisample.txt"] -deqp_args = [ - "--deqp-surface-width=256", "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", - "--deqp-gl-config-name=rgba8888d24s8ms4", -] -prefix = "multisample-" - -[[deqp]] -deqp = "/deqp-gles/modules/gles31/deqp-gles31" -caselists = ["/deqp-gles/mustpass/gles31-multisample.txt"] -deqp_args = [ - "--deqp-surface-width=256", "--deqp-surface-height=256", - "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", - "--deqp-gl-config-name=rgba8888d24s8ms4", -] -prefix = "multisample-" - diff --git a/src/intel/ci/deqp-anv-adl-angle.toml b/src/intel/ci/deqp-anv-adl-angle.toml index d2c27dad0f0..c585614c2b4 100644 --- a/src/intel/ci/deqp-anv-adl-angle.toml +++ b/src/intel/ci/deqp-anv-adl-angle.toml @@ -18,7 +18,6 @@ deqp_args = [ "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", "--deqp-gl-config-name=rgba8888d24s8ms0", ] -fraction = 3 [[deqp]] deqp = "/deqp-gles/modules/gles31/deqp-gles31" @@ -28,7 +27,6 @@ deqp_args = [ "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden", "--deqp-gl-config-name=rgba8888d24s8ms0", ] -fraction = 3 [[deqp]] deqp = "/deqp-gles/external/openglcts/modules/glcts" diff --git a/src/intel/ci/gitlab-ci.yml b/src/intel/ci/gitlab-ci.yml index 7caa8be6b6f..f534afc90dd 100644 --- a/src/intel/ci/gitlab-ci.yml +++ b/src/intel/ci/gitlab-ci.yml @@ -102,15 +102,7 @@ anv-adl-angle: DEQP_SUITE: anv-adl-angle GPU_VERSION: angle-anv-adl timeout: 30m - parallel: 4 - -anv-adl-angle-full: - extends: - - anv-adl-angle - - .anv-manual-rules - variables: - DEQP_SUITE: anv-adl-angle-full - timeout: 30m + parallel: 5 anv-tgl-angle: extends: