Skip to content

Commit 735e223

Browse files
authored
Merge pull request #34009 from def-/pr-nightly57
ci: Nightly fixes (2025-11-03)
2 parents ba04e14 + 3384101 commit 735e223

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

ci/plugins/cloudtest/hooks/command

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ cleanup() {
185185
sudo systemctl restart docker
186186
docker ps --all --quiet | xargs --no-run-if-empty docker rm --force --volumes
187187

188+
# Don't run the cleanup function twice
189+
trap - EXIT SIGTERM SIGINT
188190
exit "$CI_ANNOTATE_ERRORS_RESULT"
189191
}
190192

ci/plugins/mzcompose/hooks/command

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,8 @@ cleanup() {
350350
exit 1
351351
fi
352352

353+
# Don't run the cleanup function twice
354+
trap - EXIT SIGTERM SIGINT
353355
exit "$CI_ANNOTATE_ERRORS_RESULT"
354356
}
355357

misc/python/materialize/parallel_workload/expression.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
from materialize.data_ingest.data_type import (
1414
DATA_TYPES,
15-
UUID,
1615
Boolean,
1716
Bytea,
1817
DataType,
@@ -260,10 +259,11 @@ def __init__(self, text: str, params: list, unsupported: ExprKind = ExprKind.ALL
260259
FuncOp("list_cat({}, {})", [IntList, IntList]),
261260
]
262261

263-
FUNC_OPS[UUID] += [
264-
FuncOp("uuid_generate_v5({}, {})", [UUID, Text]),
265-
# FuncOp("cast({} as uuid)", [Text]),
266-
]
262+
# uuid_generate_v5 can return NULL
263+
# FUNC_OPS[UUID] += [
264+
# FuncOp("uuid_generate_v5({}, {})", [UUID, Text]),
265+
# # FuncOp("cast({} as uuid)", [Text]),
266+
# ]
267267

268268

269269
def expression(
@@ -277,7 +277,7 @@ def expression(
277277
level: int = 0,
278278
) -> str:
279279
if level < 60:
280-
if FUNC_OPS[data_type] and rng.random() < 0.5:
280+
if FUNC_OPS[data_type] and rng.random() < 0.7:
281281
fnop = rng.choice(FUNC_OPS[data_type])
282282
if (
283283
kind == ExprKind.ALL

0 commit comments

Comments
 (0)