Skip to content

Commit 2b0bbc7

Browse files
committed
ci: Nightly fixes
1 parent 673f5df commit 2b0bbc7

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

ci/plugins/mzcompose/hooks/command

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,7 @@ cleanup() {
224224
mzcompose down --volumes || true
225225
else
226226
# Ignore failures, we still want the rest of the cleanup
227-
mzcompose stop --timeout=0 || true
228-
mzcompose rm -f || true
229-
bin/ci-builder run "$builder" docker volume prune -f || true
230-
bin/ci-builder run "$builder" docker network prune -f || true
227+
bin/ci-builder run "$builder" timeout 60s bin/mzcompose --find "$BUILDKITE_PLUGIN_MZCOMPOSE_COMPOSITION" down --timeout=0 --volumes || true
231228
fi
232229

233230
echo "Finding core files"

misc/python/materialize/cli/ci_annotate_errors.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@
199199
# TODO: Reenable when https://github.com/MaterializeInc/database-issues/issues/9970 is fixed
200200
| limits-materialized-.* \| .* very\ slow\ coordinator\ message
201201
| zippy-materialized.* \| .* very\ slow\ coordinator\ message
202+
| sqlsmith-mz.* \| .* very\ slow\ coordinator\ message
202203
# Expected on AWS in RQG because of build
203204
| comm="check"\ exe="/usr/bin/qemu-
204205
)

misc/python/materialize/parallel_workload/database.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,14 +1015,15 @@ def create(self, exe: Executor, composition: Composition) -> None:
10151015
for row in exe.cur.fetchall():
10161016
exe.execute(f"DROP CLUSTER {identifier(row[0])} CASCADE")
10171017

1018-
exe.execute("SELECT name FROM mz_roles WHERE name LIKE 'r%'")
1019-
for row in exe.cur.fetchall():
1020-
exe.execute(f"DROP ROLE {identifier(row[0])} CASCADE")
1021-
10221018
exe.execute("DROP SECRET IF EXISTS pgpass CASCADE")
10231019
exe.execute("DROP SECRET IF EXISTS mypass CASCADE")
1020+
exe.execute("DROP SECRET IF EXISTS sql_server_pass CASCADE")
10241021
exe.execute("DROP SECRET IF EXISTS minio CASCADE")
10251022

1023+
exe.execute("SELECT name FROM mz_roles WHERE name LIKE 'r%'")
1024+
for row in exe.cur.fetchall():
1025+
exe.execute(f"DROP ROLE {identifier(row[0])}")
1026+
10261027
print("Creating connections")
10271028

10281029
exe.execute(

0 commit comments

Comments
 (0)