From 71503d1f15a77a7f3feebd1386350e5bb8863c45 Mon Sep 17 00:00:00 2001
From: Dennis Felsing <dennis@felsing.org>
Date: Fri, 2 Jan 2026 09:50:08 +0000
Subject: [PATCH] ci: Nightly fixes

---
 ci/plugins/mzcompose/hooks/command                    | 8 ++++----
 misc/python/materialize/cli/ci_annotate_errors.py     | 1 +
 misc/python/materialize/parallel_workload/database.py | 9 +++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ci/plugins/mzcompose/hooks/command b/ci/plugins/mzcompose/hooks/command
index b46ef5e8a4dda..9947e61095b31 100644
--- a/ci/plugins/mzcompose/hooks/command
+++ b/ci/plugins/mzcompose/hooks/command
@@ -224,10 +224,10 @@ cleanup() {
     mzcompose down --volumes || true
   else
     # Ignore failures, we still want the rest of the cleanup
-    mzcompose stop --timeout=0 || true
-    mzcompose rm -f || true
-    bin/ci-builder run "$builder" docker volume prune -f || true
-    bin/ci-builder run "$builder" docker network prune -f || true
+    bin/ci-builder run "$builder" timeout 60s bin/mzcompose --find "$BUILDKITE_PLUGIN_MZCOMPOSE_COMPOSITION" down --timeout=1 --volumes || {
+        sudo systemctl restart docker || true
+        bin/ci-builder run "$builder" timeout 60s bin/mzcompose --find "$BUILDKITE_PLUGIN_MZCOMPOSE_COMPOSITION" down --timeout=1 --volumes || true
+    }
   fi
 
   echo "Finding core files"
diff --git a/misc/python/materialize/cli/ci_annotate_errors.py b/misc/python/materialize/cli/ci_annotate_errors.py
index 9b2a2c6705b2e..2de09bf13fd1b 100644
--- a/misc/python/materialize/cli/ci_annotate_errors.py
+++ b/misc/python/materialize/cli/ci_annotate_errors.py
@@ -199,6 +199,7 @@
     # TODO: Reenable when https://github.com/MaterializeInc/database-issues/issues/9970 is fixed
     | limits-materialized-.* \| .* very\ slow\ coordinator\ message
     | zippy-materialized.* \| .* very\ slow\ coordinator\ message
+    | sqlsmith-mz.* \| .* very\ slow\ coordinator\ message
     # Expected on AWS in RQG because of build
     | comm="check"\ exe="/usr/bin/qemu-
     )
diff --git a/misc/python/materialize/parallel_workload/database.py b/misc/python/materialize/parallel_workload/database.py
index e38c2dcd33e7f..8064c9d564e4f 100644
--- a/misc/python/materialize/parallel_workload/database.py
+++ b/misc/python/materialize/parallel_workload/database.py
@@ -1015,14 +1015,15 @@ def create(self, exe: Executor, composition: Composition) -> None:
         for row in exe.cur.fetchall():
             exe.execute(f"DROP CLUSTER {identifier(row[0])} CASCADE")
 
-        exe.execute("SELECT name FROM mz_roles WHERE name LIKE 'r%'")
-        for row in exe.cur.fetchall():
-            exe.execute(f"DROP ROLE {identifier(row[0])} CASCADE")
-
         exe.execute("DROP SECRET IF EXISTS pgpass CASCADE")
         exe.execute("DROP SECRET IF EXISTS mypass CASCADE")
+        exe.execute("DROP SECRET IF EXISTS sql_server_pass CASCADE")
         exe.execute("DROP SECRET IF EXISTS minio CASCADE")
 
+        exe.execute("SELECT name FROM mz_roles WHERE name LIKE 'r%'")
+        for row in exe.cur.fetchall():
+            exe.execute(f"DROP ROLE {identifier(row[0])}")
+
         print("Creating connections")
 
         exe.execute(