From: Eric Anholt <eric@anholt.net>
Date: Mon, 4 May 2020 20:42:41 +0000 (-0700)
Subject: ci: Clean up setup of the job-specific env vars in baremetal testing.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c7bbc211d681696687a134eb158d55fcb674907c;p=mesa.git

ci: Clean up setup of the job-specific env vars in baremetal testing.

Avoids copy and paste errors when adding more vars.

Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4896>
---

diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index 5e57639c476..5d2d1de176c 100755
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -50,11 +50,20 @@ cp -Rp $BM_ROOTFS rootfs
 
 # Set up the init script that brings up the system.
 cp $BM/init.sh rootfs/init
-sed -i "s|DEQP_VER_REPLACE|$DEQP_VER|g" rootfs/init
-sed -i "s|DEQP_PARALLEL_REPLACE|$DEQP_PARALLEL|g" rootfs/init
-sed -i "s|DEQP_EXPECTED_RENDERER_REPLACE|$DEQP_EXPECTED_RENDERER|g" rootfs/init
-sed -i "s|CI_NODE_INDEX_REPLACE|$CI_NODE_INDEX|g" rootfs/init
-sed -i "s|CI_NODE_TOTAL_REPLACE|$CI_NODE_TOTAL|g" rootfs/init
+
+# Pass through relevant env vars from the gitlab job to the baremetal init script
+touch rootfs/set-job-env-vars.sh
+chmod +x rootfs/set-job-env-vars.sh
+for var in \
+    CI_NODE_INDEX \
+    CI_NODE_TOTAL \
+    DEQP_EXPECTED_RENDERER \
+    DEQP_PARALLEL \
+    DEQP_VER \
+    ; do
+  val=`echo ${!var} | sed 's|"||g'`
+  echo "export $var=\"${val}\"" >> rootfs/set-job-env-vars.sh
+done
 
 # Add the Mesa drivers we built, and make a consistent symlink to them.
 mkdir -p rootfs/$CI_PROJECT_DIR
diff --git a/.gitlab-ci/bare-metal/init.sh b/.gitlab-ci/bare-metal/init.sh
index ba0168691d0..edaaa9692cd 100644
--- a/.gitlab-ci/bare-metal/init.sh
+++ b/.gitlab-ci/bare-metal/init.sh
@@ -9,11 +9,8 @@ mkdir -p /dev/pts
 mount -t devpts devpts /dev/pts
 
 export DEQP_NO_SAVE_RESULTS=1
-export DEQP_VER=DEQP_VER_REPLACE
-export DEQP_PARALLEL=DEQP_PARALLEL_REPLACE
-export DEQP_EXPECTED_RENDERER=DEQP_EXPECTED_RENDERER_REPLACE
-export CI_NODE_INDEX=CI_NODE_INDEX_REPLACE
-export CI_NODE_TOTAL=CI_NODE_TOTAL_REPLACE
+. /set-job-env-vars.sh
+
 export DEQP_SKIPS=deqp-skips.txt
 if [ -e /install/deqp-expected-fails.txt ]; then
   export DEQP_EXPECTED_FAILS=deqp-expected-fails.txt