Merge pull request #34257 from def-/pr-nightly58-terraform

ci/tests/release process: Nightly fixes (2025-11-24)

Author: def-

ci/nightly/pipeline.template.yml

@@ -2427,6 +2427,7 @@ steps:
           MZ_GHCR: 0
         agents:
           queue: hetzner-aarch64-8cpu-16gb
+        skip: "https://github.com/MaterializeInc/materialize/pull/34214"
 
       - id: orchestratord-upgrade-combine
         label: "Orchestratord test (upgrade, combine props)"
@@ -2442,6 +2443,7 @@ steps:
           MZ_GHCR: 0
         agents:
           queue: hetzner-aarch64-8cpu-16gb
+        skip: "https://github.com/MaterializeInc/materialize/pull/34214"
 
       - id: orchestratord-upgrade-chain-individual
         label: "Orchestratord test (upgrade chain, individual props)"
@@ -2457,6 +2459,7 @@ steps:
           MZ_GHCR: 0
         agents:
           queue: hetzner-aarch64-8cpu-16gb
+        skip: "https://github.com/MaterializeInc/materialize/pull/34214"
 
       - id: orchestratord-upgrade-chain-combine
         label: "Orchestratord test (upgrade chain, combine props)"
@@ -2472,3 +2475,4 @@ steps:
           MZ_GHCR: 0
         agents:
           queue: hetzner-aarch64-16cpu-32gb
+        skip: "https://github.com/MaterializeInc/materialize/pull/34214"

ci/plugins/cloudtest/hooks/command

@@ -75,6 +75,9 @@ ci_uncollapsed_heading "cloudtest: Running \`$TEST_CMD\`"
 TEST_RESULT=0
 
 cleanup() {
+  # Don't run the cleanup function twice
+  trap - EXIT SIGTERM SIGINT
+
   echo "--- Post command steps"
   # Buildkite exposes no way to check if a test timed out (and wasn't cancelled manually), so we have to calculate it ourselves
   START_TIME=$(date -d "$STEP_START_TIMESTAMP" +%s)
@@ -185,8 +188,6 @@ cleanup() {
   sudo systemctl restart docker
   docker ps --all --quiet | xargs --no-run-if-empty docker rm --force --volumes
 
-  # Don't run the cleanup function twice
-  trap - EXIT SIGTERM SIGINT
   exit "$CI_ANNOTATE_ERRORS_RESULT"
 }
 

ci/plugins/mzcompose/hooks/command

@@ -92,6 +92,9 @@ ci_uncollapsed_heading ":docker: Running \`$TEST_CMD\`"
 echo "$TEST_DESC"
 
 cleanup() {
+  # Don't run the cleanup function twice
+  trap - EXIT SIGTERM SIGINT
+
   # Buildkite exposes no way to check if a test timed out (and wasn't cancelled manually), so we have to calculate it ourselves
   START_TIME=$(date -d "$STEP_START_TIMESTAMP" +%s)
   END_TIME=$(date +%s)
@@ -351,8 +354,6 @@ cleanup() {
     bin/clear-corrupted-cargo-target-dir run.log
   fi
 
-  # Don't run the cleanup function twice
-  trap - EXIT SIGTERM SIGINT
   exit "$CI_ANNOTATE_ERRORS_RESULT"
 }
 

doc/developer/testdrive.md

@@ -933,41 +933,43 @@ a version of Materialize that is able to execute the SQL constructs contained th
 
 ```
 $ skip-if
-SELECT mz_version_num() < 2601;
+SELECT mz_version_num() < 2600203;
 ```
 
+The above example references v26.2.3
+
 ## Run an action/query conditionally on version
 
 ```
->[version>=13000] SELECT 1;
+>[version>=2600203] SELECT 1;
 1
 ```
 
-The `[version>=13000]` property allows running the action or query only when we are connected to a Materialize instance with a compatible version. The supported comparison operators are `>`, `>=`, `=`, `<=` and `<`. The version number is the same as returned from [`mz_version_num()`](https://materialize.com/docs/sql/functions/#system-information-functions) and has the same format `XXYYYZZ`, where `XX` is the major version, `YYY` is the minor version and `ZZ` is the patch version. So in the example we are only running the `SELECT 1` query if the Materialize instance is of version `v0.130.0` or higher. For lower versions no query is run and no comparison of results is performed subsequently.
+The `[version>=2600203]` property allows running the action or query only when we are connected to a Materialize instance with a compatible version. The supported comparison operators are `>`, `>=`, `=`, `<=` and `<`. The version number is the same as returned from [`mz_version_num()`](https://materialize.com/docs/sql/functions/#system-information-functions) and has the same format `XXYYYZZ`, where `XX` is the major version, `YYY` is the minor version and `ZZ` is the patch version. So in the example we are only running the `SELECT 1` query if the Materialize instance is of version `v26.2.3` or higher. For lower versions no query is run and no comparison of results is performed subsequently.
 
 You can bound the version above and below using the following syntax:
 
 ```
->[13500<=version<14300] SELECT 1;
+>[2600203<=version<2600300] SELECT 1;
 1
 ```
 
 You can use `<` or `<=` freely. The following are equivalent:
 
 ```
->[version>14300] SELECT 1;
+>[version>2600300] SELECT 1;
 1
->[14300<version] SELECT 1;
+>[2600300<version] SELECT 1;
 1
 ```
 
-If you change the result of a query in version `v0.148.0-dev` for example, you have to keep the old version working in Platform Checks as well as Testdrive/MySQL CDC/Postgres CDC with old syntax for migration tests, since they may run the code with both an older Materialize version and the currently tested one. To do that, you can duplicate the query and version-gate it accordingly:
+If you change the result of a query in version `v26.3.0-dev` for example, you have to keep the old version working in Platform Checks as well as Testdrive/MySQL CDC/Postgres CDC with old syntax for migration tests, since they may run the code with both an older Materialize version and the currently tested one. To do that, you can duplicate the query and version-gate it accordingly:
 
 ```
-?[version<14800] EXPLAIN SELECT * FROM t1 AS a1, t1 AS a2 WHERE a1.f1 IS NOT NULL;
+?[version<2600300] EXPLAIN SELECT * FROM t1 AS a1, t1 AS a2 WHERE a1.f1 IS NOT NULL;
 [OLD QUERY PLAN HERE]
 
-?[version>=14800] EXPLAIN SELECT * FROM t1 AS a1, t1 AS a2 WHERE a1.f1 IS NOT NULL;
+?[version>=2600300] EXPLAIN SELECT * FROM t1 AS a1, t1 AS a2 WHERE a1.f1 IS NOT NULL;
 [NEW QUERY PLAN HERE]
 ```
 

doc/user/content/releases/v26.0.md

@@ -3,7 +3,6 @@ title: "Materialize v26.0"
 date: 2025-11-19
 released: true
 patch: 0
-rc: 1
 _build:
   render: never
 ---

doc/user/content/releases/v26.1.md

@@ -2,6 +2,7 @@
 title: "Materialize v26.1"
 date: 2025-11-26
 released: false
+rc: 1
 _build:
   render: never
 ---

misc/python/materialize/checks/all_checks/statement_logging.py

@@ -22,7 +22,7 @@ def initialize(self) -> Testdrive:
                 $ postgres-execute connection=postgres://mz_system@${testdrive.materialize-internal-sql-addr}
                 ALTER SYSTEM SET statement_logging_max_sample_rate TO 1.0
 
-                $[version>=2600100] postgres-execute connection=postgres://mz_system@${testdrive.materialize-internal-sql-addr}
+                $[version>=2600200] postgres-execute connection=postgres://mz_system@${testdrive.materialize-internal-sql-addr}
                 ALTER SYSTEM SET enable_frontend_peek_sequencing = false;
                 """
             )

misc/python/materialize/release/mark_release_complete.py

@@ -10,6 +10,7 @@
 """Mark a minor release series as complete."""
 
 import argparse
+import re
 import sys
 
 from materialize import git, spawn
@@ -26,11 +27,11 @@ def main():
 
     print(f"Marking {args.release_version} as released in the docs...")
     release_version_doc_file = doc_file_path(args.release_version)
-    release_version_doc_file.write_text(
-        release_version_doc_file.read_text().replace(
-            "released: false", f"released: true\npatch: {args.patch}"
-        )
+    text = release_version_doc_file.read_text().replace(
+        "released: false", f"released: true\npatch: {args.patch}"
     )
+    text = re.sub(r"^rc: .*$\n?", "", text, flags=re.MULTILINE)
+    release_version_doc_file.write_text(text)
     git.add_file(str(release_version_doc_file))
     git.commit_all_changed(f"release: mark {args.release_version} as released")
 

test/cluster/mzcompose.py

@@ -3701,7 +3701,7 @@ def workflow_statement_logging(c: Composition, parser: WorkflowArgumentParser) -
         c.testdrive(
             input=dedent(
                 """
-                $[version>=2600100] postgres-execute connection=postgres://mz_system@${testdrive.materialize-internal-sql-addr}
+                $ postgres-execute connection=postgres://mz_system@${testdrive.materialize-internal-sql-addr}
                 ALTER SYSTEM SET enable_frontend_peek_sequencing = false;
                 """
             )

test/terraform/mzcompose.py

@@ -1244,7 +1244,17 @@ def workflow_azure_temporary(c: Composition, parser: WorkflowArgumentParser) ->
     path = MZ_ROOT / "test" / "terraform" / "azure-temporary"
     state = State(path)
 
-    spawn.runv(["bin/ci-builder", "run", "stable", "uv", "venv", str(path / "venv")])
+    spawn.runv(
+        [
+            "bin/ci-builder",
+            "run",
+            "stable",
+            "uv",
+            "venv",
+            "--clear",
+            str(path / "venv"),
+        ],
+    )
     venv_env = os.environ.copy()
     venv_env["PATH"] = f"{path/'venv'/'bin'}:{os.getenv('PATH')}"
     venv_env["VIRTUAL_ENV"] = str(path / "venv")