From 46d9b500f4fa57affbb75ffe092dcf23a717706f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 22 May 2020 15:48:55 -0700 Subject: [PATCH] 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 Part-of: --- .gitlab-ci.yml | 2 ++ .gitlab-ci/bare-metal/fastboot.sh | 1 + .gitlab-ci/bare-metal/init.sh | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8103eb60c91..a28250888e6 100644 --- 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 afb5278e292..221d8efc26e 100755 --- 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 ae3e071a52c..2dc944da974 100644 --- 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 -- 2.30.2