From 46a23d163ccef5279eaa1299fec5c34696168b9c Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Mon, 16 Mar 2026 19:42:23 -0700
Subject: [PATCH 1/2] [spr] initial version

Created using spr 1.3.6-beta.1
---
 .config/nextest.toml                | 2 ++
 .github/buildomat/build-and-test.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.config/nextest.toml b/.config/nextest.toml
index 39416445b0c..cee8b2e4ea9 100644
--- a/.config/nextest.toml
+++ b/.config/nextest.toml
@@ -17,6 +17,8 @@ setup = 'crdb-seed'
 
 [profile.ci]
 fail-fast = false
+retries = 2
+flaky-result = "fail"
 
 [profile.ci.junit]
 path = "junit.xml"
diff --git a/.github/buildomat/build-and-test.sh b/.github/buildomat/build-and-test.sh
index 4ad2e5c4a03..5565b26d78c 100755
--- a/.github/buildomat/build-and-test.sh
+++ b/.github/buildomat/build-and-test.sh
@@ -18,7 +18,7 @@ target_os=$1
 # NOTE: This version should be in sync with the recommended version in
 # .config/nextest.toml. (Maybe build an automated way to pull the recommended
 # version in the future.)
-NEXTEST_VERSION='0.9.125'
+NEXTEST_VERSION='0.9.131-rc.2'
 
 cargo --version
 rustc --version

From 4c2f62386f58bc1b5a6b2cf0d1797399521e7785 Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Wed, 18 Mar 2026 13:36:23 -0700
Subject: [PATCH 2/2] export a Chrome trace

Created using spr 1.3.6-beta.1
---
 .github/buildomat/build-and-test.sh             | 7 +++++++
 .github/buildomat/jobs/build-and-test-helios.sh | 6 ++++++
 .github/buildomat/jobs/build-and-test-linux.sh  | 7 ++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/.github/buildomat/build-and-test.sh b/.github/buildomat/build-and-test.sh
index ac3ea3eae09..26098ebdda0 100755
--- a/.github/buildomat/build-and-test.sh
+++ b/.github/buildomat/build-and-test.sh
@@ -138,6 +138,7 @@ RECORDING_CONFIG_DIR="/tmp/nextest-recording-config"
 RECORDING_CONFIG="$RECORDING_CONFIG_DIR/config.toml"
 NEXTEST_STATE_DIR="$(mktemp -d /tmp/nextest-state.XXXXXX)"
 ARCHIVE_PATH="/tmp/nextest-run-archive.zip"
+CHROME_TRACE_PATH="/tmp/nextest-chrome-trace.json"
 
 mkdir -p "$RECORDING_CONFIG_DIR"
 printf '[experimental]\nrecord = true\n\n[record]\nenabled = true\n' \
@@ -160,6 +161,12 @@ if ! ptime -m cargo nextest store export latest \
     echo "warning: failed to export recording archive" >&2
 fi
 
+if ! ptime -m cargo nextest store export-chrome-trace latest \
+    --user-config-file "$RECORDING_CONFIG" \
+    --output "$CHROME_TRACE_PATH"; then
+    echo "warning: failed to export Chrome trace" >&2
+fi
+
 if [[ "$NEXTEST_EXIT" -ne 0 ]]; then
     echo "error: cargo nextest run failed with exit code $NEXTEST_EXIT" >&2
     exit "$NEXTEST_EXIT"
diff --git a/.github/buildomat/jobs/build-and-test-helios.sh b/.github/buildomat/jobs/build-and-test-helios.sh
index 0671a5b8b8c..dc665ee5a87 100755
--- a/.github/buildomat/jobs/build-and-test-helios.sh
+++ b/.github/buildomat/jobs/build-and-test-helios.sh
@@ -9,6 +9,7 @@
 #:	"%/work/oxidecomputer/omicron/target/nextest/ci/junit.xml",
 #:	"%/work/oxidecomputer/omicron/target/live-tests-archive.tgz",
 #:	"=/tmp/nextest-run-archive.zip",
+#:	"=/tmp/nextest-chrome-trace.json",
 #:	"%/var/tmp/omicron_tmp/**/*",
 #:	"!/var/tmp/omicron_tmp/crdb-base*",
 #:	"!/var/tmp/omicron_tmp/rustc*",
@@ -41,5 +42,10 @@
 #: series = "nextest-recording-helios"
 #: name = "nextest-run-archive.zip"
 #: from_output = "/tmp/nextest-run-archive.zip"
+#:
+#: [[publish]]
+#: series = "nextest-recording-helios"
+#: name = "nextest-chrome-trace.json"
+#: from_output = "/tmp/nextest-chrome-trace.json"
 
 exec .github/buildomat/build-and-test.sh illumos
diff --git a/.github/buildomat/jobs/build-and-test-linux.sh b/.github/buildomat/jobs/build-and-test-linux.sh
index a9eed80a686..9cefedbd212 100755
--- a/.github/buildomat/jobs/build-and-test-linux.sh
+++ b/.github/buildomat/jobs/build-and-test-linux.sh
@@ -8,6 +8,7 @@
 #:	"%/work/*",
 #:	"%/work/oxidecomputer/omicron/target/nextest/ci/junit.xml",
 #:	"=/tmp/nextest-run-archive.zip",
+#:	"=/tmp/nextest-chrome-trace.json",
 #:	"%/var/tmp/omicron_tmp/**/*",
 #:	"!/var/tmp/omicron_tmp/crdb-base*",
 #:	"!/var/tmp/omicron_tmp/rustc*",
@@ -35,7 +36,11 @@
 #: series = "nextest-recording-linux"
 #: name = "nextest-run-archive.zip"
 #: from_output = "/tmp/nextest-run-archive.zip"
-
+#:
+#: [[publish]]
+#: series = "nextest-recording-linux"
+#: name = "nextest-chrome-trace.json"
+#: from_output = "/tmp/nextest-chrome-trace.json"
 
 sudo apt-get install -y jq
 exec .github/buildomat/build-and-test.sh linux