orchestratord test: Change upgrade order

Author: def-

ci/nightly/pipeline.template.yml

@@ -2367,6 +2367,7 @@ steps:
     steps:
       - id: orchestratord-defaults
         label: "Orchestratord test (defaults from documentation)"
+        artifact_paths: ["mz_debug_*.zip"]
         depends_on: devel-docker-tags
         timeout_in_minutes: 120
         plugins:
@@ -2379,6 +2380,7 @@ steps:
 
       - id: orchestratord-default-properties
         label: "Orchestratord test (defaults for properties)"
+        artifact_paths: ["mz_debug_*.zip"]
         depends_on: devel-docker-tags
         timeout_in_minutes: 120
         plugins:
@@ -2391,6 +2393,7 @@ steps:
 
       - id: orchestratord-individual
         label: "Orchestratord test (individual properties)"
+        artifact_paths: ["mz_debug_*.zip"]
         depends_on: devel-docker-tags
         timeout_in_minutes: 120
         plugins:
@@ -2403,76 +2406,65 @@ steps:
 
       - id: orchestratord-combine
         label: "Orchestratord test (combine properties)"
+        artifact_paths: ["mz_debug_*.zip"]
         depends_on: build-aarch64
-        timeout_in_minutes: 120
+        timeout_in_minutes: 60
         plugins:
           - ./ci/plugins/mzcompose:
               composition: orchestratord
-              args: [--action=noop, --properties=combine, --runtime=3600, --recreate-cluster]
+              args: [--action=noop, --properties=combine, --runtime=1800, --recreate-cluster]
               ci-builder: stable
         agents:
           queue: hetzner-aarch64-16cpu-32gb
 
       - id: orchestratord-upgrade-individual
         label: "Orchestratord test (upgrade, individual props)"
+        artifact_paths: ["mz_debug_*.zip"]
         depends_on: devel-docker-tags
-        timeout_in_minutes: 120
+        timeout_in_minutes: 60
         plugins:
           - ./ci/plugins/mzcompose:
               composition: orchestratord
-              args: [--action=upgrade, --properties=individual, --runtime=3600, --recreate-cluster]
+              args: [--action=upgrade, --properties=individual, --runtime=1800, --recreate-cluster]
               ci-builder: stable
-        env:
-          # Old versions are not on GHCR yet
-          MZ_GHCR: 0
         agents:
-          queue: hetzner-aarch64-8cpu-16gb
-        skip: "https://github.com/MaterializeInc/materialize/pull/34214"
+          queue: hetzner-x86-64-dedi-16cpu-64gb
 
       - id: orchestratord-upgrade-combine
         label: "Orchestratord test (upgrade, combine props)"
+        artifact_paths: ["mz_debug_*.zip"]
         depends_on: devel-docker-tags
-        timeout_in_minutes: 120
+        timeout_in_minutes: 60
         plugins:
           - ./ci/plugins/mzcompose:
               composition: orchestratord
-              args: [--action=upgrade, --properties=combine, --runtime=3600, --recreate-cluster]
+              args: [--action=upgrade, --properties=combine, --runtime=1800, --recreate-cluster]
               ci-builder: stable
-        env:
-          # Old versions are not on GHCR yet
-          MZ_GHCR: 0
         agents:
-          queue: hetzner-aarch64-8cpu-16gb
-        skip: "https://github.com/MaterializeInc/materialize/pull/34214"
+          queue: hetzner-x86-64-dedi-16cpu-64gb
 
       - id: orchestratord-upgrade-chain-individual
         label: "Orchestratord test (upgrade chain, individual props)"
+        artifact_paths: ["mz_debug_*.zip"]
         depends_on: devel-docker-tags
-        timeout_in_minutes: 120
+        timeout_in_minutes: 60
         plugins:
           - ./ci/plugins/mzcompose:
               composition: orchestratord
-              args: [--action=upgrade-chain, --properties=individual, --runtime=3600, --recreate-cluster]
+              args: [--action=upgrade-chain, --properties=individual, --runtime=1800, --recreate-cluster]
               ci-builder: stable
-        env:
-          # Old versions are not on GHCR yet
-          MZ_GHCR: 0
         agents:
-          queue: hetzner-aarch64-8cpu-16gb
-        skip: "https://github.com/MaterializeInc/materialize/pull/34214"
+          queue: hetzner-x86-64-dedi-16cpu-64gb
 
       - id: orchestratord-upgrade-chain-combine
         label: "Orchestratord test (upgrade chain, combine props)"
+        artifact_paths: ["mz_debug_*.zip"]
         depends_on: devel-docker-tags
-        timeout_in_minutes: 120
+        timeout_in_minutes: 60
         plugins:
           - ./ci/plugins/mzcompose:
               composition: orchestratord
-              args: [--action=upgrade-chain, --properties=combine, --runtime=3600, --recreate-cluster]
+              args: [--action=upgrade-chain, --properties=combine, --runtime=1800, --recreate-cluster]
               ci-builder: stable
-        env:
-          # Old versions are not on GHCR yet
-          MZ_GHCR: 0
         agents:
-          queue: hetzner-aarch64-16cpu-32gb
-        skip: "https://github.com/MaterializeInc/materialize/pull/34214"
+          queue: hetzner-x86-64-dedi-16cpu-64gb

misc/python/materialize/version_list.py

@@ -94,6 +94,8 @@ def get_supported_self_managed_versions() -> list[MzVersion]:
     MzVersion.parse_mz("v0.130.2"),
     MzVersion.parse_mz("v0.130.3"),
     MzVersion.parse_mz("v0.130.4"),
+    # orchestratord test is failing with v0.130.7 versions, not sure yet why
+    MzVersion.parse_mz("v0.130.7"),
     MzVersion.parse_mz(
         "v0.147.7"
     ),  # Incompatible for upgrades because it clears login attribute for roles due to catalog migration

test/orchestratord/cluster.yaml

@@ -164,6 +164,7 @@ nodes:
     image: kindest/node:v1.32.5
     labels:
       materialize.cloud/scratch-fs: "true"
+      materialize.cloud/disk: "true"
       materialize.cloud/availability-zone: "2"
       topology.kubernetes.io/zone: "2"
       workload: "materialize-instance"