Mesa (main): ci/lava: Don't overwrite PIGLIT_REPLAY_EXTRA_ARGS

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: e210ed60bece8ba4f158c4bad9f40443012f007f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e210ed60bece8ba4f158c4bad9f40443012f007f

Author: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Date:   Thu Jun 10 13:43:56 2021 +0200

ci/lava: Don't overwrite PIGLIT_REPLAY_EXTRA_ARGS

Other Piglit jobs will want different values for this env var.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11293>

---

 .gitlab-ci/lava.yml.jinja2                    | 1 -
 src/gallium/drivers/iris/ci/gitlab-ci.yml     | 4 ++--
 src/gallium/drivers/panfrost/ci/gitlab-ci.yml | 4 ++--
 src/gallium/drivers/radeonsi/ci/gitlab-ci.yml | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci/lava.yml.jinja2 b/.gitlab-ci/lava.yml.jinja2
index e9735d6b3af..9c7a3794bee 100644
--- a/.gitlab-ci/lava.yml.jinja2
+++ b/.gitlab-ci/lava.yml.jinja2
@@ -112,7 +112,6 @@ actions:
           - export XDG_CACHE_HOME=/tmp
 
           - export PYTHONPATH=$(python3 -c "import sys;print(\":\".join(sys.path))")
-          - export PIGLIT_REPLAY_EXTRA_ARGS="--keep-image"
           - export PIGLIT_REPLAY_REFERENCE_IMAGES_BASE_URL="/mesa-tracie-results/${CI_PROJECT_PATH}"
           - export PIGLIT_REPLAY_ARTIFACTS_BASE_URL="/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}/${CI_JOB_ID}"
           - export MINIO_ARTIFACTS_PATH="minio://${MINIO_HOST}/${PIGLIT_REPLAY_ARTIFACTS_BASE_URL}/"
diff --git a/src/gallium/drivers/iris/ci/gitlab-ci.yml b/src/gallium/drivers/iris/ci/gitlab-ci.yml
index b30842e5d7b..ea9f56a08d9 100644
--- a/src/gallium/drivers/iris/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/iris/ci/gitlab-ci.yml
@@ -155,7 +155,7 @@ iris-amly-egl:
   extends:
     - .lava-traces-base
   variables:
-    ENV_VARS: "EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_JUNIT_RESULTS=1"
+    ENV_VARS: "EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_JUNIT_RESULTS=1 PIGLIT_REPLAY_EXTRA_ARGS=--keep-image"
 
 .iris-apl-traces:
   variables:
@@ -184,4 +184,4 @@ iris-kbl-traces:
   extends:
     - .iris-kbl-test
     - .iris-traces
-    - .test-manual-mr
\ No newline at end of file
+    - .test-manual-mr
diff --git a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
index afa9e2d47a4..dbba6dcbf6b 100644
--- a/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/panfrost/ci/gitlab-ci.yml
@@ -42,7 +42,7 @@ panfrost-t760-traces:armhf:
     DRIVER_NAME: panfrost
     BOOT_METHOD: depthcharge
     KERNEL_IMAGE_TYPE: ""
-    ENV_VARS: "PAN_MESA_DEBUG=deqp,sync MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_JUNIT_RESULTS=1"
+    ENV_VARS: "PAN_MESA_DEBUG=deqp,sync MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_JUNIT_RESULTS=1 PIGLIT_REPLAY_EXTRA_ARGS=--keep-image"
   tags:
     - mesa-ci-x86-64-lava-rk3288-veyron-jaq
 
@@ -90,7 +90,7 @@ panfrost-t860-traces:arm64:
     - .lava-piglit-traces:arm64
     - .lava-rk3399-gru-kevin
   variables:
-    ENV_VARS: "PAN_MESA_DEBUG=deqp,sync MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_JUNIT_RESULTS=1"
+    ENV_VARS: "PAN_MESA_DEBUG=deqp,sync MESA_GLES_VERSION_OVERRIDE=3.1 MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_JUNIT_RESULTS=1 PIGLIT_REPLAY_EXTRA_ARGS=--keep-image"
 
 .lava-meson-g12b-a311d-khadas-vim3:
   extends:
diff --git a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
index df155884abd..90d35f449d3 100644
--- a/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/radeonsi/ci/gitlab-ci.yml
@@ -46,7 +46,7 @@ radeonsi-stoney-traces:amd64:
     - .lava-piglit-traces:amd64
     - .radeonsi-stoney-test:amd64
   variables:
-    ENV_VARS: "EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_JUNIT_RESULTS=1"
+    ENV_VARS: "EGL_PLATFORM=surfaceless PIGLIT_PROFILES=replay PIGLIT_JUNIT_RESULTS=1 PIGLIT_REPLAY_EXTRA_ARGS=--keep-image"
   tags:
     - mesa-ci-x86-64-lava-hp-11A-G6-EE-grunt