From 87d58ea57ade0710870f07d21e9f02292dd16418 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Tue, 8 Apr 2025 15:47:15 +0200 Subject: [PATCH] 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 Part-of: --- .gitlab-ci/lava/lava-gitlab-ci.yml | 1 - .gitlab-ci/test/gitlab-ci.yml | 2 +- src/freedreno/ci/gitlab-ci-inc.yml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml index 3a020a01c31..c5c6cd6ccb6 100644 --- a/.gitlab-ci/lava/lava-gitlab-ci.yml +++ b/.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: diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index 1b2641188df..a55c2bfd7de 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.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 diff --git a/src/freedreno/ci/gitlab-ci-inc.yml b/src/freedreno/ci/gitlab-ci-inc.yml index bc61c303815..188daa6fafb 100644 --- a/src/freedreno/ci/gitlab-ci-inc.yml +++ b/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: