From 1aeedddbb6393bf4df74f480aeba1b9f657ba4e0 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Tue, 8 Apr 2025 12:55:38 +0200
Subject: [PATCH] ci/piglit: Drop redundant PIGLIT_PROFILES variable

PIGLIT_PROFILES was only used with the piglit-runner.sh script, which no
jobs were using anymore.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34424>
---
 .gitlab-ci/bare-metal/fastboot.sh                  | 6 +-----
 .gitlab-ci/common/export-gitlab-job-env-for-dut.sh | 1 -
 .gitlab-ci/lava/lava-gitlab-ci.yml                 | 2 +-
 src/freedreno/ci/gitlab-ci.yml                     | 3 ---
 src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml  | 1 -
 src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml     | 1 -
 src/intel/ci/gitlab-ci-inc.yml                     | 2 +-
 7 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index 930d06b5f9b..f1bbf1b9d3b 100755
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -82,11 +82,7 @@ else
   # Finally, pack it up into a cpio rootfs.  Skip the vulkan CTS since none of
   # these devices use it and it would take up space in the initrd.
 
-  if [ -n "$PIGLIT_PROFILES" ]; then
-    EXCLUDE_FILTER="deqp|arb_gpu_shader5|arb_gpu_shader_fp64|arb_gpu_shader_int64|glsl-4.[0123456]0|arb_tessellation_shader"
-  else
-    EXCLUDE_FILTER="piglit|python"
-  fi
+  EXCLUDE_FILTER="deqp|arb_gpu_shader5|arb_gpu_shader_fp64|arb_gpu_shader_int64|glsl-4.[0123456]0|arb_tessellation_shader"
 
   pushd rootfs
   find -H . | \
diff --git a/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh b/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh
index 3c93b41ae3d..0f21b3b704b 100755
--- a/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh
+++ b/.gitlab-ci/common/export-gitlab-job-env-for-dut.sh
@@ -99,7 +99,6 @@ VARS=(
     PIGLIT_NO_WINDOW
     PIGLIT_OPTIONS
     PIGLIT_PLATFORM
-    PIGLIT_PROFILES
     PIGLIT_REPLAY_ANGLE_ARCH
     PIGLIT_REPLAY_ARTIFACTS_BASE_URL
     PIGLIT_REPLAY_DEVICE_NAME
diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml
index 23e376db18d..3a020a01c31 100644
--- a/.gitlab-ci/lava/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava/lava-gitlab-ci.yml
@@ -151,7 +151,7 @@ variables:
 .lava-piglit:
   variables:
     PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}"
-    PIGLIT_RESULTS: "${GPU_VERSION}-${PIGLIT_PROFILES}"
+    PIGLIT_RESULTS: "${GPU_VERSION}-replay"
     HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
 
 .lava-piglit-traces:x86_64:
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index d90b896f056..789287e8297 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -197,7 +197,6 @@ a618-piglit-cl:
     DEQP_SUITE: freedreno-a618-piglit-cl
     FLAKES_CHANNEL: "#freedreno-ci"
     HWCI_START_WESTON: 1
-    PIGLIT_PROFILES: cl
 
 a618-traces:
   extends:
@@ -251,7 +250,6 @@ a660-piglit-cl:
   variables:
     DEQP_SUITE: freedreno-a660-piglit-cl
     HWCI_START_WESTON: 1
-    PIGLIT_PROFILES: cl
 
 a660-gl:
   extends:
@@ -461,7 +459,6 @@ a750-piglit-cl:
   variables:
     DEQP_SUITE: freedreno-a750-piglit-cl
     HWCI_START_WESTON: 1
-    PIGLIT_PROFILES: cl
     HWCI_TEST_SCRIPT: ./install/deqp-runner.sh
     VK_DRIVER: freedreno
 
diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml
index 2e2dabac7a6..71a6e3c717e 100644
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml
@@ -87,7 +87,6 @@
     - .llvmpipe-test
   variables:
     LP_NUM_THREADS: 1
-    PIGLIT_PROFILES: cl
 
 .llvmpipe-deqp-test:
   variables:
diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
index 779cb9322db..7e4cbd2ae41 100644
--- a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
@@ -85,5 +85,4 @@
     CROSVM_GALLIUM_DRIVER: iris
     CROSVM_GPU_ARGS: "gles=false,backend=virglrenderer,egl=true,surfaceless=true"
     EGL_PLATFORM: surfaceless
-    PIGLIT_PROFILES: replay
     PIGLIT_TRACES_FILE: traces-virgl-iris.yml
diff --git a/src/intel/ci/gitlab-ci-inc.yml b/src/intel/ci/gitlab-ci-inc.yml
index a3244cffb91..3338fadae94 100644
--- a/src/intel/ci/gitlab-ci-inc.yml
+++ b/src/intel/ci/gitlab-ci-inc.yml
@@ -421,7 +421,7 @@
   variables:
     EGL_PLATFORM: surfaceless
     PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}"
-    PIGLIT_RESULTS: "${GPU_VERSION}-${PIGLIT_PROFILES}"
+    PIGLIT_RESULTS: "${GPU_VERSION}-replay"
     PIGLIT_TRACES_FILE: traces-iris.yml
 
 .iris-whl-traces: