ART-21958: Rebuild and sync CI golang-builder images when their golang parent changes

doozer/doozerlib/cli/images_streams.py

@@ -386,6 +386,8 @@ def mirror_image(cmd_start: str, upstream_dest: str):
             # upstream_image to all the upstream_image_mirror destinations so they all get the same version.
             if config.upstream_image_mirror is not Missing:
                 for upstream_image_mirror_dest in config.upstream_image_mirror:
+                    if live_test_mode:
+                        upstream_image_mirror_dest += '.test'
                     # Mirror to each destination only if not in only-if-missing mode OR destination doesn't exist
                     if not only_if_missing or not destinations_to_check.get(upstream_image_mirror_dest, False):
                         priv_cmd = f'oc image mirror {config.upstream_image}'

doozer/doozerlib/cli/scan_sources_konflux.py

@@ -563,8 +563,9 @@ async def find_latest_image_builds(self, image_names: List[str]):
         self.latest_image_build_records_map.update((zip(image_names, latest_image_builds)))
 
     async def scan_images(self, image_names: List[str]):
-        # Filter to only enabled images (variant-aware filtering is handled by _is_image_enabled)
-        image_names = filter(lambda name: self._is_image_enabled(self.runtime.image_map[name]), image_names)
+        # Filter to only enabled images (variant-aware filtering is handled by _is_image_enabled_for_scan,
+        # which also honors --load-disabled -- unlike _is_image_enabled alone)
+        image_names = filter(lambda name: self._is_image_enabled_for_scan(self.runtime.image_map[name]), image_names)
 
         # Do not scan images that have already been requested for rebuild
         image_names = list(filter(lambda name: name not in self.changing_image_names, image_names))

ocp-build-data-validator/tests/test_schema/test_group_schema.py

@@ -102,3 +102,33 @@ def test_validate_with_invalid_okd_enabled_flag(self):
             },
         }
         self.assertIn("'yes' is not of type 'boolean'", group_schema.validate("group.yml", invalid_data))
+
+    def test_validate_with_distinct_go_version_vars(self):
+        valid_data = {
+            "name": "openshift-4.22",
+            "vars": {"MAJOR": 4, "MINOR": 22, "GO_LATEST": "1.25", "GO_EXTRA": "1.24", "GO_PREVIOUS": "1.23"},
+        }
+        self.assertEqual("", group_schema.validate("group.yml", valid_data))
+
+    def test_validate_with_duplicate_go_version_vars(self):
+        invalid_data = {
+            "name": "openshift-4.22",
+            "vars": {"MAJOR": 4, "MINOR": 22, "GO_LATEST": "1.25", "GO_EXTRA": "1.25"},
+        }
+        result = group_schema.validate("group.yml", invalid_data)
+        self.assertIn("GO_EXTRA and GO_LATEST cannot both resolve to the same major.minor version (1.25)", result)
+
+    def test_validate_with_duplicate_go_version_vars_different_patch(self):
+        invalid_data = {
+            "name": "openshift-4.22",
+            "vars": {"MAJOR": 4, "MINOR": 22, "GO_LATEST": "1.25.1", "GO_PREVIOUS": "1.25.0"},
+        }
+        result = group_schema.validate("group.yml", invalid_data)
+        self.assertIn("GO_PREVIOUS and GO_LATEST cannot both resolve to the same major.minor version (1.25)", result)
+
+    def test_validate_with_invalid_go_version_var(self):
+        invalid_data = {
+            "name": "openshift-4.22",
+            "vars": {"MAJOR": 4, "MINOR": 22, "GO_LATEST": "not-a-version"},
+        }
+        self.assertIn("Invalid GO_LATEST value: not-a-version", group_schema.validate("group.yml", invalid_data))

ocp-build-data-validator/validator/schema/group_schema.py

@@ -5,6 +5,7 @@
 """
 
 import json
+import re
 import sys
 
 from artcommonlib.util import validate_bridge_release_basis_group
@@ -14,6 +15,38 @@
 
 from validator.support import replace_vars
 
+GO_VERSION_VARS = ("GO_LATEST", "GO_EXTRA", "GO_PREVIOUS")
+
+
+def _go_major_minor(var_name, value):
+    match = re.fullmatch(r"(\d+)\.(\d+)(?:\.\d+)?", str(value))
+    if not match:
+        raise SchemaError(f"Invalid {var_name} value: {value}")
+    return f"{match[1]}.{match[2]}"
+
+
+def _validate_go_version_vars(vars_map):
+    """
+    GO_LATEST/GO_EXTRA/GO_PREVIOUS must all resolve to distinct major.minor versions.
+    Consumers (e.g. pyartcd's update_golang pipeline) rely on this to identify a single
+    matching variant for a given golang build, rather than having to check every variant
+    that could share the same major.minor.
+    """
+    major_minors = {}
+    for var_name in GO_VERSION_VARS:
+        value = vars_map.get(var_name)
+        if value is None:
+            continue
+        major_minor = _go_major_minor(var_name, value)
+        if major_minor in major_minors:
+            return (
+                f"{var_name} and {major_minors[major_minor]} cannot both resolve to the same "
+                f"major.minor version ({major_minor})"
+            )
+        major_minors[major_minor] = var_name
+    return ''
+
+
 if sys.version_info < (3, 9):
     # importlib.resources either doesn't exist or lacks the files()
     # function, so use the PyPI version:
@@ -95,4 +128,11 @@ def validate(_, data):
         except ValueError as e:
             return str(e)
 
+    try:
+        go_version_error = _validate_go_version_vars(vars_map)
+    except SchemaError as e:
+        return str(e)
+    if go_version_error:
+        return go_version_error
+
     return ''

pyartcd/pyartcd/jenkins.py

@@ -52,7 +52,8 @@ class Jobs(Enum):
     SCAN_PLASHET_RPMS = 'scanning/scanning%2Fplashet-rpms'
     BUILD_CONFORMA_VERIFY = 'aos-cd-builds/build%2Fbuild-conforma-verify'
     SCAN_OPERATOR = 'aos-cd-builds/build%2Fscan-operator'
-    SYNC_CI_IMAGES = 'aos-cd-builds/build%2Fsync-ci-images'
+    # TODO TEST
+    SYNC_CI_IMAGES = 'hack/bvizi/add-load-disabled'
     OPEN_RECONCILIATION_PRS = 'aos-cd-builds/build%2Fopen-reconciliation-prs'
     OPEN_RECONCILIATION_PRS_LAYERED = 'aos-cd-builds/build%2Fopen-reconciliation-prs-layered-products'
 
@@ -531,10 +532,25 @@ def start_rhcos(build_version: str, new_build: bool, job_name: str = 'build', **
     )
 
 
-def start_sync_ci_images(version: str, **kwargs) -> Optional[str]:
+def start_sync_ci_images(
+    version: str,
+    assembly: str = 'stream',
+    image_list: list = None,
+    dry_run: bool = False,
+    load_disabled: bool = False,
+    live_test_mode: bool = False,
+    **kwargs,
+) -> Optional[str]:
     params = {
         'VERSION': version,
     }
+    if image_list:
+        params['IMAGES'] = ','.join(image_list)
+    params['ART_TOOLS_COMMIT'] = 'kopero2000@ci-golang-builder-from-update-golang-ART-21958'
+    params['DRY_RUN'] = dry_run
+    params['LOAD_DISABLED'] = load_disabled
+    params['LIVE_TEST_MODE'] = live_test_mode
+    params['ASSEMBLY'] = assembly
     return start_build(
         job=Jobs.SYNC_CI_IMAGES,
         params=params,

pyartcd/pyartcd/pipelines/sync_ci_images.py

@@ -57,6 +57,8 @@ def __init__(
         skip_waits: bool = False,
         force_run: bool = False,
         update_images_only_when_missing: bool = False,
+        load_disabled: bool = False,
+        live_test_mode: bool = False,
     ) -> None:
         """
         Initialize sync-ci-images pipeline.
@@ -84,7 +86,8 @@ def __init__(
         self.skip_waits = skip_waits
         self.force_run = force_run
         self.update_images_only_when_missing = update_images_only_when_missing
-
+        self.load_disabled = load_disabled
+        self.live_test_mode = live_test_mode
         # Validate parameters
         self._validate_parameters()
 
@@ -512,6 +515,8 @@ def _build_doozer_options(self, group_dir: Path, auth_file: str) -> str:
             f"--build-system {self.BUILD_SYSTEM} "
             f"--registry-config {auth_file}"
         )
+        if self.load_disabled:
+            doozer_opts += " --load-disabled"
         return doozer_opts
 
     @property
@@ -547,6 +552,8 @@ async def _mirror_images_to_ci(self, doozer_opts: str, auth_file: str) -> None:
             mirror_args += "--only-if-missing "
         if self.runtime.dry_run:
             mirror_args += "--dry-run"
+        if self.live_test_mode:
+            mirror_args += "--live-test-mode"
         await self._run_doozer_command(doozer_opts, "images:streams mirror", mirror_args.strip())
 
     async def _trigger_ci_builds(self, doozer_opts: str, auth_file: str) -> None:
@@ -669,6 +676,18 @@ async def run(self) -> int:
     default=False,
     help='Pass --only-if-missing to doozer mirror (update only missing images)',
 )
+@click.option(
+    '--load-disabled',
+    is_flag=True,
+    default=False,
+    help='Pass --load-disabled to doozer mirror',
+)
+@click.option(
+    '--live-test-mode',
+    is_flag=True,
+    default=False,
+    help='Pass --live-test-mode to doozer mirror',
+)
 @pass_runtime
 @click_coroutine
 async def sync_ci_images_cli(
@@ -682,6 +701,8 @@ async def sync_ci_images_cli(
     skip_waits: bool,
     force_run: bool,
     update_images_only_when_missing: bool,
+    load_disabled: bool,
+    live_test_mode: bool,
 ):
     """
     CLI entrypoint for sync-ci-images pipeline.
@@ -709,6 +730,8 @@ async def sync_ci_images_cli(
         skip_waits=skip_waits,
         force_run=force_run,
         update_images_only_when_missing=update_images_only_when_missing,
+        load_disabled=load_disabled,
+        live_test_mode=live_test_mode,
     )
 
     # Run with per-version lock