ci/piglit: Consolidate HWCI_TEST_SCRIPT for piglit traces

The HWCI_TEST_SCRIPT variable was always getting overwritten for these
definitions.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34424>

.gitlab-ci/lava/lava-gitlab-ci.yml

@@ -152,7 +152,6 @@ variables:
   variables:
     PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}"
     PIGLIT_RESULTS: "${GPU_VERSION}-replay"
-    HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
 
 .lava-piglit-traces:x86_64:
   extends:

.gitlab-ci/test/gitlab-ci.yml

@@ -200,7 +200,7 @@ yaml-toml-shell-py-test:
     DEVICE_HANGING_TIMEOUT_SEC: 600
     PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=${S3_TRACIE_PUBLIC_BUCKET} --jwt-file=${S3_JWT_FILE}
     PIGLIT_NO_WINDOW: 1
-    HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
+    HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
   script:
     - section_start variables "Variables passed through:"
     - install/common/export-gitlab-job-env-for-dut.sh

src/freedreno/ci/gitlab-ci-inc.yml

@@ -289,7 +289,6 @@
   extends:
     - .piglit-traces-test
   variables:
-    HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
     HWCI_START_XORG: 1
     PIGLIT_TRACES_FILE: traces-freedreno.yml
   artifacts: