ci: Move baremetal DEQP_NO_SAVE_RESULTS setup to the yml.

I'm going to want it unset (artifacts enabled) for the cheza jobs.

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5225>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8103eb60c913acb31ed11d1cdc0873e06675b535..a28250888e6a62ecd78ea4c71a97b8b0eb41725a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -877,6 +877,8 @@ arm64_a306_gles2:
     DEQP_VER: gles2
     DEQP_PARALLEL: 4
     DEQP_EXPECTED_RENDERER: FD307
+    # Since we can't get artifacts back yet, skip making them.
+    DEQP_NO_SAVE_RESULTS: 1
     # NIR_VALIDATE=0 left intentionally unset as a3xx is fast enough at its small testsuite.
   script:
     - .gitlab-ci/bare-metal/fastboot.sh

diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index afb5278e29295c37debabceb4b6c8052dc46d314..221d8efc26e5f07e80611892c7bae6c3b68dcf2d 100755 (executable)
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -68,6 +68,7 @@ for var in \
     CI_RUNNER_DESCRIPTION \
     DEQP_CASELIST_FILTER \
     DEQP_EXPECTED_RENDERER \
+    DEQP_NO_SAVE_RESULTS \
     DEQP_PARALLEL \
     DEQP_RUN_SUFFIX \
     DEQP_VER \

diff --git a/.gitlab-ci/bare-metal/init.sh b/.gitlab-ci/bare-metal/init.sh
index ae3e071a52c06401d8183a367e35e06849c11d21..2dc944da97404d1b3e0b723d47506dcc0ff125d8 100644 (file)
--- a/.gitlab-ci/bare-metal/init.sh
+++ b/.gitlab-ci/bare-metal/init.sh
@@ -8,7 +8,6 @@ mount -t devtmpfs none /dev || echo possibly already mounted
 mkdir -p /dev/pts
 mount -t devpts devpts /dev/pts
 
-export DEQP_NO_SAVE_RESULTS=1
 . /set-job-env-vars.sh
 
 echo "nameserver 8.8.8.8" > /etc/resolv.conf