ci: Improve the flakes reports on IRC.

[mesa.git] / .gitlab-ci / bare-metal / fastboot.sh

diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index 3136f0f580128453da5b07a3a3fd2a5b984807c0..801cb9a14079ec7950d79ce61c3c7bde12843d58 100755 (executable)
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -15,6 +15,12 @@ if [ -z "$BM_POWERUP" ]; then
   exit 1
 fi
 
+if [ -z "$BM_POWERDOWN" ]; then
+  echo "Must set BM_POWERDOWN in your gitlab-runner config.toml [[runners]] environment"
+  echo "This is a shell script that should power off the device."
+  exit 1
+fi
+
 if [ -z "$BM_FASTBOOT_SERIAL" ]; then
   echo "Must set BM_FASTBOOT_SERIAL in your gitlab-runner config.toml [[runners]] environment"
   echo "This must be the a stable-across-resets fastboot serial number."
@@ -44,10 +50,28 @@ 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|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_COMMIT_BRANCH \
+    CI_COMMIT_TITLE \
+    CI_JOB_URL \
+    CI_MERGE_REQUEST_SOURCE_BRANCH_NAME \
+    CI_MERGE_REQUEST_TITLE \
+    CI_NODE_INDEX \
+    CI_NODE_TOTAL \
+    CI_PIPELINE_ID \
+    CI_RUNNER_DESCRIPTION \
+    DEQP_EXPECTED_RENDERER \
+    DEQP_PARALLEL \
+    DEQP_VER \
+    FLAKES_CHANNEL \
+    ; 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
@@ -89,6 +113,9 @@ fastboot boot -s $BM_FASTBOOT_SERIAL artifacts/fastboot.img
 # Wait for the device to complete the deqp run
 $BM/expect-output.sh artifacts/serial-output.txt "DEQP RESULT"
 
+# power down the device
+PATH=$BM:$PATH $BM_POWERDOWN
+
 set +e
 if grep -q "DEQP RESULT: pass" artifacts/serial-output.txt; then
    exit 0