From d1360bfd90c6d7f0f8094e42b7908612a25f09cc Mon Sep 17 00:00:00 2001 From: Jon Currey Date: Fri, 18 Sep 2026 22:17:41 -0400 Subject: [PATCH] orchestratord: revert the dead MinIO image rewrite in documentation-defaults This reverts commit b74fff0dd7 (#38908). #38918 landed fifteen minutes before #38908 and fixed the same nightly failure by no longer downloading the published MinIO manifest at all: sample-minio.yaml is always copied from the in-tree file. #38908 was written against the earlier tree and merged without a rebase, so its branch on `file == "sample-minio.yaml"` can never match, and the regex and the import-time `MINIO_IMAGE` read are dead code. Two comments in the same loop also disagreed about whether released-version iterations exercise the published manifest. Removing the dead hunks leaves #38918's approach as the fix and drops an import-time file read whose only failure mode would have been breaking pipeline generation for nothing. Co-Authored-By: Claude Fable 5.1 --- test/orchestratord/mzcompose.py | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/test/orchestratord/mzcompose.py b/test/orchestratord/mzcompose.py index 4b5743bb1efdb..952df25765d4e 100644 --- a/test/orchestratord/mzcompose.py +++ b/test/orchestratord/mzcompose.py @@ -17,7 +17,6 @@ import json import os import random -import re import shutil import signal import subprocess @@ -771,18 +770,6 @@ def check() -> None: retry(check, 240) -def _minio_image() -> str: - """The MinIO image the current tree's manifest uses, read from the file so the - two cannot drift.""" - manifest = MZ_ROOT / "misc" / "helm-charts" / "testing" / "minio.yaml" - for line in manifest.read_text().splitlines(): - if line.strip().startswith("image:"): - return line.split("image:", 1)[1].strip() - raise ValueError(f"no image line in {manifest}") - - -MINIO_IMAGE = _minio_image() - # Must match test/orchestratord/priorityclass.yaml. PRIORITY_CLASS_NAME = "mz-test-priority" PRIORITY_CLASS_VALUE = 1000000000 @@ -2388,20 +2375,6 @@ def workflow_documentation_defaults( shutil.copyfile(path, os.path.join(dir, file)) else: content = download_repo_file_at_tag(path, str(version)) - if file == "sample-minio.yaml": - # Every released tag's manifest still says `image: - # minio/minio`, which resolves to docker.io, where MinIO - # deleted the repository (#38802, #38824). The published - # files cannot be changed, so point the downloaded copy at - # the image the current tree uses. Everything else in the - # manifest is exercised as published. - content = re.sub( - rb"^(\s*image:\s*)minio/minio\s*$", - rb"\g<1>" + MINIO_IMAGE.encode(), - content, - count=1, - flags=re.MULTILINE, - ) with open(os.path.join(dir, file), "wb") as f: f.write(content)