ci/piglit: specify only the traces file in the job config

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26278>
2023-11-19 15:16:31 +00:00
parent 653405ee08
commit 4de3ce1f2c
17 changed files with 20 additions and 18 deletions
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -96,7 +96,6 @@ for var in \
    PIGLIT_PLATFORM \
    PIGLIT_PROFILES \
    PIGLIT_REPLAY_ARTIFACTS_BASE_URL \
-    PIGLIT_REPLAY_DESCRIPTION_FILE \
    PIGLIT_REPLAY_DEVICE_NAME \
    PIGLIT_REPLAY_EXTRA_ARGS \
    PIGLIT_REPLAY_LOOP_TIMES \
@@ -104,6 +103,7 @@ for var in \
    PIGLIT_REPLAY_SUBCOMMAND \
    PIGLIT_RESULTS \
    PIGLIT_TESTS \
+    PIGLIT_TRACES_FILE \
    PIPELINE_ARTIFACTS_BASE \
    RADV_DEBUG \
    RADV_PERFTEST \
--- a/.gitlab-ci/piglit/piglit-traces.sh
+++ b/.gitlab-ci/piglit/piglit-traces.sh
@@ -13,6 +13,8 @@ S3_ARGS="--token-file ${CI_JOB_JWT_FILE}"
 RESULTS=$(realpath -s "$PWD"/results)
 mkdir -p "$RESULTS"

+export PIGLIT_REPLAY_DESCRIPTION_FILE="$INSTALL/$PIGLIT_TRACES_FILE"
+
 if [ "$PIGLIT_REPLAY_SUBCOMMAND" = "profile" ]; then
    yq -iY 'del(.traces[][] | select(.label[]? == "no-perf"))' \
      "$PIGLIT_REPLAY_DESCRIPTION_FILE"
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -183,7 +183,7 @@
    - .lava-piglit-traces:x86_64
  variables:
    PIGLIT_PLATFORM: mixed_glx_egl  # TODO, take wine/VK in account
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-amd.yml"
+    PIGLIT_TRACES_FILE: traces-amd.yml

 ############### Valve Infra
 .test-radv:
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -45,7 +45,7 @@ radeonsi-stoney-traces:x86_64:
    - .radeonsi-stoney-test:x86_64
  variables:
    EGL_PLATFORM: surfaceless
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-amd.yml"
+    PIGLIT_TRACES_FILE: traces-amd.yml

 radv-raven-vkcts:x86_64:
  extends:
--- a/src/broadcom/ci/gitlab-ci.yml
+++ b/src/broadcom/ci/gitlab-ci.yml
@@ -174,7 +174,7 @@ v3d-rpi4-traces:arm64:
    GPU_VERSION: broadcom-rpi4
    HWCI_KERNEL_MODULES: v3d,vc4
    HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-broadcom.yml"
+    PIGLIT_TRACES_FILE: traces-broadcom.yml
    PIGLIT_REPLAY_DEVICE_NAME: "broadcom-rpi4"
    PIGLIT_RESULTS: "broadcom-rpi4-replay"
  tags:
--- a/src/freedreno/ci/gitlab-ci-inc.yml
+++ b/src/freedreno/ci/gitlab-ci-inc.yml
@@ -190,7 +190,7 @@
  variables:
    HWCI_TEST_SCRIPT: "/install/piglit/piglit-traces.sh"
    HWCI_START_XORG: 1
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-freedreno.yml"
+    PIGLIT_TRACES_FILE: traces-freedreno.yml
  artifacts:
    reports:
      junit: results/junit.xml
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -131,7 +131,7 @@ a618-traces:
    # missing.
    MESA_GLSL_VERSION_OVERRIDE: "460"
    MESA_GL_VERSION_OVERRIDE: "4.6"
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-freedreno.yml"
+    PIGLIT_TRACES_FILE: traces-freedreno.yml

 a618-traces-performance:
  extends:
@@ -261,7 +261,7 @@ a630-traces-restricted:
    - a630-traces
    - .google-freedreno-rules-restricted
  variables:
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/restricted-traces-freedreno.yml"
+    PIGLIT_TRACES_FILE: restricted-traces-freedreno.yml
    PIGLIT_REPLAY_EXTRA_ARGS: "--download-caching-proxy-url=http://10.42.0.1:8888/cache/?uri= --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${CI_JOB_JWT_FILE}"
  allow_failure: true

--- a/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml
@@ -32,5 +32,5 @@
    - .piglit-traces-test
  variables:
    EGL_PLATFORM: "surfaceless"
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-crocus.yml"
+    PIGLIT_TRACES_FILE: traces-crocus.yml
    PIGLIT_REPLAY_DEVICE_NAME: "crocus-g41"
--- a/src/gallium/drivers/crocus/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/crocus/ci/gitlab-ci.yml
@@ -20,5 +20,5 @@ crocus-hsw-traces:
    - .crocus-manual-rules
  variables:
    EGL_PLATFORM: "surfaceless"
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-crocus.yml"
+    PIGLIT_TRACES_FILE: traces-crocus.yml
    PIGLIT_REPLAY_DEVICE_NAME: "crocus-hsw"
--- a/src/gallium/drivers/i915/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/i915/ci/gitlab-ci.yml
@@ -24,5 +24,5 @@
    - .piglit-traces-test
  variables:
    EGL_PLATFORM: "surfaceless"
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-i915.yml"
+    PIGLIT_TRACES_FILE: traces-i915.yml
    PIGLIT_REPLAY_DEVICE_NAME: "i915-g33"
--- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
@@ -21,7 +21,7 @@ llvmpipe-traces:
    - .llvmpipe-test
  variables:
    EGL_PLATFORM: "surfaceless"
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-llvmpipe.yml"
+    PIGLIT_TRACES_FILE: traces-llvmpipe.yml
    PIGLIT_REPLAY_DEVICE_NAME: "gl-vmware-llvmpipe"
    PIGLIT_RESULTS: "llvmpipe-replay"

--- a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml
@@ -77,5 +77,5 @@
    CROSVM_GPU_ARGS: "gles=false,backend=virglrenderer,egl=true,surfaceless=true,width=1024,height=768"
    EGL_PLATFORM: surfaceless
    PIGLIT_PROFILES: replay
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-virgl-iris.yml"
+    PIGLIT_TRACES_FILE: traces-virgl-iris.yml
    RUNNER_TAG: mesa-ci-x86-64-lava-asus-cx9400-volteer
--- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml
@@ -38,7 +38,7 @@ virgl-traces:
    - .piglit-traces-test
  variables:
    EGL_PLATFORM: "surfaceless"
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-virgl.yml"
+    PIGLIT_TRACES_FILE: traces-virgl.yml
    PIGLIT_REPLAY_DEVICE_NAME: "gl-virgl"
    PIGLIT_RESULTS: "virgl-replay"
    LD_LIBRARY_PATH: "${CI_PROJECT_DIR}/install/lib/"     # For Crosvm
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -52,14 +52,14 @@ zink-anv-tgl-traces:
    # dependencies right.
    - .lava-traces-base
  variables:
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-zink.yml"
+    PIGLIT_TRACES_FILE: traces-zink.yml

 zink-anv-tgl-traces-restricted:
  extends:
    - zink-anv-tgl-traces
    - .zink-anv-rules-restricted
  variables:
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-zink-restricted.yml"
+    PIGLIT_TRACES_FILE: traces-zink-restricted.yml
    PIGLIT_REPLAY_EXTRA_ARGS: --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_bucket=mesa-tracie-private --jwt-file=${CI_JOB_JWT_FILE}
  allow_failure: true

--- a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
+++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
@@ -29,7 +29,7 @@ lavapipe-vk-asan:
 lavapipe-traces:
  variables:
    MESA_VK_IGNORE_CONFORMANCE_WARNING: 1
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "${CI_PROJECT_DIR}/install/traces-lavapipe.yml"
+    PIGLIT_TRACES_FILE: traces-lavapipe.yml
    PIGLIT_REPLAY_DEVICE_NAME: "vk-lvp"
    PIGLIT_RESULTS: "${GPU_VERSION}-replay"
  stage: software-renderer
--- a/src/intel/ci/gitlab-ci-inc.yml
+++ b/src/intel/ci/gitlab-ci-inc.yml
@@ -269,7 +269,7 @@
    EGL_PLATFORM: surfaceless
    PIGLIT_REPLAY_DEVICE_NAME: "gl-${GPU_VERSION}"
    PIGLIT_RESULTS: "${GPU_VERSION}-${PIGLIT_PROFILES}"
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-iris.yml"
+    PIGLIT_TRACES_FILE: traces-iris.yml

 .iris-whl-traces:
  variables:
--- a/src/panfrost/ci/gitlab-ci.yml
+++ b/src/panfrost/ci/gitlab-ci.yml
@@ -85,7 +85,7 @@
    MESA_GL_VERSION_OVERRIDE: "3.3"
    MESA_GLSL_VERSION_OVERRIDE: 330
    EGL_PLATFORM: surfaceless
-    PIGLIT_REPLAY_DESCRIPTION_FILE: "/install/traces-panfrost.yml"
+    PIGLIT_TRACES_FILE: traces-panfrost.yml

 # 2 machines, but shared with KernelCI (2022-10-24)
 .lava-rk3288-veyron-jaq: