Merge pull request #31081 from def-/pr-legacy-upgrade-2

legacy upgrade test: Ignore missing version in Test pipeline

Author: def-

ci/nightly/pipeline.template.yml

@@ -1564,16 +1564,31 @@ steps:
       - ./ci/plugins/mzcompose:
           composition: balancerd
 
-  - id: legacy-upgrade
-    label: Legacy upgrade tests (last version from git)
-    depends_on: build-aarch64
-    timeout_in_minutes: 60
-    plugins:
-      - ./ci/plugins/mzcompose:
-          composition: legacy-upgrade
-          args: ["--versions-source=git"]
-    agents:
-      queue: hetzner-aarch64-4cpu-8gb
+  - group: Legacy upgrade tests
+    key: legacy-upgrade
+    steps:
+      - id: legacy-upgrade-git
+        label: Legacy upgrade tests (last version from git)
+        depends_on: build-aarch64
+        timeout_in_minutes: 60
+        plugins:
+          - ./ci/plugins/mzcompose:
+              composition: legacy-upgrade
+              args: ["--versions-source=git"]
+        agents:
+          queue: hetzner-aarch64-4cpu-8gb
+
+      - id: legacy-upgrade-docs
+        label: "Legacy upgrade tests (last version from docs)"
+        parallelism: 2
+        depends_on: build-aarch64
+        timeout_in_minutes: 60
+        plugins:
+          - ./ci/plugins/mzcompose:
+              composition: legacy-upgrade
+              args: ["--versions-source=docs"]
+        agents:
+          queue: hetzner-aarch64-4cpu-8gb
 
   - group: Cloud tests
     key: cloudtests

ci/test/pipeline.template.yml

@@ -341,15 +341,15 @@ steps:
     agents:
       queue: hetzner-aarch64-4cpu-8gb
 
-  - id: legacy-upgrade
-    label: "Legacy upgrade tests (last version from docs)"
+  - id: legacy-upgrade-docs-ignore-missing
+    label: "Legacy upgrade tests (last version from docs, ignore missing)"
     parallelism: 2
     depends_on: build-aarch64
     timeout_in_minutes: 60
     plugins:
       - ./ci/plugins/mzcompose:
           composition: legacy-upgrade
-          args: ["--versions-source=docs"]
+          args: ["--versions-source=docs", "--ignore-missing-version"]
     agents:
       queue: hetzner-aarch64-4cpu-8gb
 

test/legacy-upgrade/mzcompose.py

@@ -15,6 +15,7 @@
 import random
 
 from materialize import buildkite
+from materialize.docker import image_of_release_version_exists
 from materialize.mz_version import MzVersion
 from materialize.mzcompose import get_default_system_parameters
 from materialize.mzcompose.composition import Composition, WorkflowArgumentParser
@@ -78,6 +79,7 @@ def workflow_default(c: Composition, parser: WorkflowArgumentParser) -> None:
         choices=["docs", "git"],
         help="from what source to fetch the versions",
     )
+    parser.add_argument("--ignore-missing-version", action="store_true")
     args = parser.parse_args()
 
     parallelism_index = buildkite.get_parallelism_index()
@@ -98,6 +100,12 @@ def workflow_default(c: Composition, parser: WorkflowArgumentParser) -> None:
     )
 
     for version in tested_versions:
+        # Building the latest release might have failed, don't block PRs on
+        # test pipeline for this.
+        if args.ignore_missing_version and not image_of_release_version_exists(version):
+            print(f"Unknown version {version}, skipping")
+            continue
+
         priors = [
             v for v in all_versions if v <= version and v >= min_upgradable_version
         ]