From 1bc853f2a00cb8bf4cdf111c74a5733f5bb88e59 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Thu, 1 May 2025 12:18:50 +0200
Subject: [PATCH] ci/fluster: Add sections to job logs

Declutter the job output by adding collapsed sections.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34787>
---
 .gitlab-ci/fluster-runner.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.gitlab-ci/fluster-runner.sh b/.gitlab-ci/fluster-runner.sh
index e7ccaaa7d1a..5cb04989cb0 100755
--- a/.gitlab-ci/fluster-runner.sh
+++ b/.gitlab-ci/fluster-runner.sh
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2086 # we want word splitting
+# shellcheck disable=SC1091 # paths only become valid at runtime
+
+. "${SCRIPTS_DIR}/setup-test-env.sh"
+
+section_start test_setup "fluster: preparing test setup"
 
 set -uex -o pipefail
 
@@ -52,6 +57,8 @@ touch ${FLUSTER_FAILS}
 FLUSTER_SKIPS=$INSTALL/$GPU_VERSION-fluster-skips.txt
 touch ${FLUSTER_SKIPS}
 
+uncollapsed_section_switch fluster "fluster: fluster-runner"
+
 set +e
 
 fluster-runner \
@@ -70,6 +77,8 @@ FLUSTER_EXITCODE=$?
 
 set -e
 
+section_switch test_post_process "fluster: post-processing test results"
+
 # Report the flakes to the IRC channel for monitoring (if configured):
 if [ -n "${FLAKES_CHANNEL:-}" ]; then
     python3 $INSTALL/report-flakes.py \
@@ -95,4 +104,6 @@ deqp-runner junit \
 # GitLab.
 zstd --rm -T0 -8qc $RESULTS/results.csv -o $RESULTS/results.csv.zst
 
+section_end test_post_process
+
 exit $FLUSTER_EXITCODE