Merge pull request #34173 from def-/pr-rq4

ci: Reduce test flakiness, don't start tests for dependabot PRs in parallel

Author: def-

ci/mkpipeline.py

@@ -890,6 +890,7 @@ def remove_dependencies_on_prs(
         not ui.env_is_truthy("BUILDKITE_PULL_REQUEST")
         or os.environ["BUILDKITE_TAG"]
         or ui.env_is_truthy("CI_RELEASE_LTO_BUILD")
+        or os.environ["BUILDKITE_BRANCH"].startswith("dependabot/")
     ):
         return
     for step in steps(pipeline):

ci/nightly/pipeline.template.yml

@@ -1614,11 +1614,11 @@ steps:
         depends_on: build-aarch64
         timeout_in_minutes: 60
         agents:
-          queue: hetzner-aarch64-8cpu-16gb
+          queue: hetzner-aarch64-16cpu-32gb
         plugins:
           - ./ci/plugins/mzcompose:
               composition: sqlsmith
-              args: [--max-joins=5, --runtime=1500]
+              args: [--max-joins=2, --runtime=1500]
 
       - id: sqlsmith-explain
         label: "SQLsmith explain"
@@ -1629,7 +1629,7 @@ steps:
         plugins:
           - ./ci/plugins/mzcompose:
               composition: sqlsmith
-              args: [--max-joins=12, --explain-only, --runtime=1500]
+              args: [--max-joins=5, --explain-only, --runtime=1500]
 
   - group: SQLancer
     key: sqlancer

ci/release-qualification/pipeline.template.yml

@@ -202,7 +202,7 @@ steps:
       depends_on: build-aarch64
       timeout_in_minutes: 120
       agents:
-        queue: hetzner-aarch64-8cpu-16gb
+        queue: hetzner-aarch64-16cpu-32gb
       plugins:
         - ./ci/plugins/mzcompose:
             composition: sqlsmith
@@ -213,7 +213,7 @@ steps:
       depends_on: build-aarch64
       timeout_in_minutes: 120
       agents:
-        queue: hetzner-aarch64-4cpu-8gb
+        queue: hetzner-aarch64-16cpu-32gb
       plugins:
         - ./ci/plugins/mzcompose:
             composition: sqlsmith

ci/test/pipeline.template.yml

@@ -772,6 +772,7 @@ steps:
     trigger: deploy
     async: true
     branches: "main v*.*"
+    depends_on: ["build-x86_64", "build-aarch64"]
     build:
       commit: "$BUILDKITE_COMMIT"
       branch: "$BUILDKITE_BRANCH"

misc/python/materialize/release/cut_release.py

@@ -94,14 +94,6 @@ def main():
                 continue
             break
         print(f"{console_image} found on DockerHub")
-        spawn.runv(
-            [
-                "sed",
-                "-i",
-                f"s#FROM materialize/console:.* AS console#FROM {console_image} AS console#",
-                "misc/images/materialized-base/Dockerfile",
-            ]
-        )
 
         print(f"Bumping version to {version}")
         spawn.runv(
@@ -115,6 +107,14 @@ def main():
                 "--sbom",
             ]
         )
+        spawn.runv(
+            [
+                "sed",
+                "-i",
+                f"s#FROM materialize/console:.* AS console#FROM {console_image} AS console#",
+                "misc/images/materialized-base/Dockerfile",
+            ]
+        )
         # Commit here instead of in bump-version so we have access to the correct git author
         spawn.runv(["git", "commit", "-am", f"release: bump to version {version}"])
         print("Tagging version")

test/limits/mzcompose.py

@@ -515,6 +515,7 @@ def body(cls) -> None:
 
 class KafkaRecordsEnvelopeUpsertDistinctValues(Generator):
     COUNT = Generator.COUNT * 1_000
+    MAX_COUNT = 64000000  # Too long-running with count 77968750
 
     @classmethod
     def body(cls) -> None: