Merge pull request #30796 from def-/pr-kafka-upsert

Nightly fixes (December 11/12)
MaterializeInc · Dec 12, 2024 · d26abc0 · d26abc0
2 parents ae748a2 + 871998b
commit d26abc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/misc/python/materialize/version_ancestor_overrides.py b/misc/python/materialize/version_ancestor_overrides.py
@@ -28,7 +28,7 @@ def get_ancestor_overrides_for_performance_regressions(
 
     min_ancestor_mz_version_per_commit = dict()
 
-    if scenario_class_name in ("KafkaUpsertUnique", "ParallelIngestion"):
+    if scenario_class_name in ("KafkaUpsert", "KafkaUpsertUnique", "ParallelIngestion"):
         # PR#30617 (storage/kafka: use separate consumer for metadata probing)
         # adds 1s of delay to Kafka source startup
         min_ancestor_mz_version_per_commit[

diff --git a/test/terraform/mzcompose.py b/test/terraform/mzcompose.py
@@ -70,7 +70,8 @@ def workflow_default(c: Composition, parser: WorkflowArgumentParser) -> None:
         nargs="*",
         default=[
             "array.td",
-            "cancel-subscribe.td" "char-varchar-distinct.td",
+            "cancel-subscribe.td",
+            "char-varchar-distinct.td",
             "char-varchar-joins.td",
             "char-varchar-multibyte.td",
             "constants.td",