Add gen-assembly-lp and prepare-release-lp pipelines for Layered Products

Implements two new pipelines for ACM/MCE assembly-based releases:

- gen-assembly-lp: Extracts operand NVRs from FBC images, supports
  --include for swapping specific builds, and --basis-assembly for
  lightweight inherited assemblies. Creates a PR to ocp-build-data.

- prepare-release-lp: Reads a named assembly from releases.yml,
  checks for existing bundles before rebuilding, triggers FBC builds,
  and creates shipment MRs. Uses named assembly (not stream) for
  deterministic builds.

Includes unit tests (24 passing) and CLI registration.

Co-authored-by: Cursor <cursoragent@cursor.com>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED

Author: ashwindasr

doozer/doozerlib/cli/fbc.py

@@ -649,21 +649,21 @@ async def _rebase_and_build(
         operator_meta: ImageMetadata,
         bundle_build: KonfluxBundleBuildRecord,
         git_auth_secret: Optional[str] = None,
-    ) -> str:
+    ) -> Tuple[str, str]:
         """Rebase and build FBC for the given operator and bundle build.
 
         :param rebaser: FBC rebaser instance
         :param builder: FBC builder instance
         :param operator_meta: Operator metadata
         :param bundle_build: Bundle build record
         :param git_auth_secret: Name of the transient git-auth Secret for PipelineRuns
-        :return: NVR of the FBC build
+        :return: Tuple of (NVR, pullspec) of the FBC build
         """
         existing_fbc_build = await self._check_existing_fbc_build(operator_meta, bundle_build)
         if existing_fbc_build:
             self._logger.info(f"Found existing FBC build: {existing_fbc_build.nvr}")
             if not self.force:
-                return existing_fbc_build.nvr
+                return existing_fbc_build.nvr, existing_fbc_build.image_pullspec or ""
             self._logger.info("Force flag is set, rebuilding FBC")
 
         if self.reset_to_prod:
@@ -673,8 +673,16 @@ async def _rebase_and_build(
         self._logger.info(f"Rebasing fbc for {operator_meta.name}...")
         nvr = await rebaser.rebase(operator_meta, bundle_build, self.version, self.release)
         self._logger.info(f"Building fbc for {operator_meta.name}...")
-        await builder.build(operator_meta, operator_nvr=bundle_build.operator_nvr, git_auth_secret=git_auth_secret)
-        return nvr
+        _, pipelinerun_dict = await builder.build(
+            operator_meta, operator_nvr=bundle_build.operator_nvr, git_auth_secret=git_auth_secret
+        )
+        results = pipelinerun_dict.get('status', {}).get('results', [])
+        image_url = next((r['value'] for r in results if r['name'] == 'IMAGE_URL'), None)
+        image_digest = next((r['value'] for r in results if r['name'] == 'IMAGE_DIGEST'), None)
+        pullspec = f"{image_url.split(':')[0]}@{image_digest}" if image_url and image_digest else ""
+        if not pullspec:
+            LOGGER.warning("Could not extract pullspec from pipelinerun results for %s", nvr)
+        return nvr, pullspec
 
     async def run(self):
         """Rebase and build fbc fragments for given operator NVRs or all latest operator NVRs for the group and assembly"""
@@ -705,7 +713,7 @@ async def run(self):
         assert runtime.source_resolver is not None, "source_resolver is not initialized. Doozer bug?"
         assert runtime.group_config is not None, "group_config is not initialized. Doozer bug?"
 
-        self._logger.info(f"Processing {len(dgk_operator_builds)} operator(s): {list(dgk_operator_builds.keys())}")
+        self._logger.info(f"Processing {len(dgk_bundle_builds)} operator(s): {list(dgk_bundle_builds.keys())}")
 
         # Set up rebase and build components once
         if self.major_minor:
@@ -786,6 +794,7 @@ async def run(self):
         try:
             results = await asyncio.gather(*tasks, return_exceptions=True)
             successful_nvrs = []
+            successful_pullspecs = []
             failed_tasks = []
             errors = []
 
@@ -804,7 +813,9 @@ async def run(self):
                     errors.append(error_details)
                     LOGGER.error(f"{error_msg}; {stack_trace}")
                 else:
-                    successful_nvrs.append(result)
+                    nvr, pullspec = result
+                    successful_nvrs.append(nvr)
+                    successful_pullspecs.append(pullspec)
         finally:
             refresh_task.cancel()
             try:
@@ -824,6 +835,7 @@ async def run(self):
         if self.output == 'json':
             output_data = {
                 "nvrs": successful_nvrs,
+                "pullspecs": successful_pullspecs,
                 "errors": errors,
                 "failed_count": len(failed_tasks),
                 "success_count": len(successful_nvrs),

doozer/doozerlib/runtime.py

@@ -29,7 +29,7 @@
 from artcommonlib.model import Missing, Model
 from artcommonlib.pushd import Dir
 from artcommonlib.runtime import GroupRuntime
-from artcommonlib.util import isolate_el_version_in_brew_tag
+from artcommonlib.util import isolate_el_version_in_brew_tag, isolate_major_minor_in_group
 from artcommonlib.variants import BuildVariant
 from jira import JIRA
 from semver import Version
@@ -612,10 +612,13 @@ def initialize(
             self.streams = assembly_streams_config(self.get_releases_config(), self.assembly, org_stream_model)
 
         strict_mode = True
+        major, minor = isolate_major_minor_in_group(self.group)
+        is_openshift_group = major is not None and minor is not None
         if (
             self.assembly_type == AssemblyTypes.STREAM
             or not self.assembly
             or self.assembly in ['stream', 'test', 'microshift']
+            or not is_openshift_group
         ):
             strict_mode = False
 

doozer/doozerlib/util.py

@@ -412,8 +412,15 @@ def get_release_name(
     release_offset: Optional[int],
 ):
     major, minor = isolate_major_minor_in_group(group_name)
+
+    if assembly_type == AssemblyTypes.STANDARD:
+        if release_offset is not None:
+            raise ValueError("release_offset can't be set for a STANDARD release.")
+        return assembly_name
+
     if major is None or minor is None:
-        raise ValueError(f"Invalid group name: {group_name}")
+        raise ValueError(f"Cannot determine major.minor from group name: {group_name}")
+
     if assembly_type == AssemblyTypes.CUSTOM:
         if release_offset is None:
             raise ValueError("release_offset is required for a CUSTOM release.")
@@ -422,10 +429,6 @@ def get_release_name(
         if release_offset is not None:
             raise ValueError(f"release_offset can't be set for a {assembly_type.value} release.")
         release_name = f"{major}.{minor}.0-{assembly_name}"
-    elif assembly_type == AssemblyTypes.STANDARD:
-        if release_offset is not None:
-            raise ValueError("release_offset can't be set for a STANDARD release.")
-        release_name = f"{assembly_name}"
     else:
         raise ValueError(f"Assembly type {assembly_type} is not supported.")
     return release_name

doozer/tests/cli/test_fbc.py

@@ -148,6 +148,17 @@ async def test_run_with_operator_nvrs(self, mock_rebaser_class, mock_builder_cla
         mock_rebaser_class.return_value = mock_rebaser
 
         mock_builder = mock.AsyncMock()
+        mock_builder.build.return_value = (
+            "test-pipelinerun",
+            {
+                "status": {
+                    "results": [
+                        {"name": "IMAGE_URL", "value": "quay.io/test/image:test-fbc-1.0.0-1"},
+                        {"name": "IMAGE_DIGEST", "value": "sha256:abc123"},
+                    ]
+                }
+            },
+        )
         mock_builder_class.return_value = mock_builder
 
         mock_importer = mock.AsyncMock()
@@ -182,6 +193,17 @@ async def test_run_without_operator_nvrs(self, mock_rebaser_class, mock_builder_
         mock_rebaser_class.return_value = mock_rebaser
 
         mock_builder = mock.AsyncMock()
+        mock_builder.build.return_value = (
+            "test-pipelinerun",
+            {
+                "status": {
+                    "results": [
+                        {"name": "IMAGE_URL", "value": "quay.io/test/image:test-fbc-1.0.0-1"},
+                        {"name": "IMAGE_DIGEST", "value": "sha256:abc123"},
+                    ]
+                }
+            },
+        )
         mock_builder_class.return_value = mock_builder
 
         mock_importer = mock.AsyncMock()
@@ -199,7 +221,11 @@ async def test_run_existing_fbc_build_found_no_force(self, mock_rebaser_class, m
         bundle_build = self._create_mock_bundle_build(
             "test-operator-bundle", "test-operator-bundle-1.0.0-1", "test-operator-1.0.0-1"
         )
-        existing_fbc = mock.Mock(spec=KonfluxFbcBuildRecord, nvr="test-fbc-1.0.0-1")
+        existing_fbc = mock.Mock(
+            spec=KonfluxFbcBuildRecord,
+            nvr="test-fbc-1.0.0-1",
+            image_pullspec="quay.io/test/image@sha256:existing123",
+        )
 
         self.runtime.konflux_db.get_build_records_by_nvrs.return_value = [operator_build]
         self.runtime.images = ["test-operator"]
@@ -233,7 +259,11 @@ async def test_run_existing_fbc_build_found_with_force(
         bundle_build = self._create_mock_bundle_build(
             "test-operator-bundle", "test-operator-bundle-1.0.0-1", "test-operator-1.0.0-1"
         )
-        existing_fbc = mock.Mock(spec=KonfluxFbcBuildRecord, nvr="test-fbc-1.0.0-1")
+        existing_fbc = mock.Mock(
+            spec=KonfluxFbcBuildRecord,
+            nvr="test-fbc-1.0.0-1",
+            image_pullspec="quay.io/test/image@sha256:existing123",
+        )
 
         self.runtime.konflux_db.get_build_records_by_nvrs.return_value = [operator_build]
         self.runtime.images = ["test-operator"]
@@ -248,6 +278,17 @@ async def test_run_existing_fbc_build_found_with_force(
         mock_rebaser_class.return_value = mock_rebaser
 
         mock_builder = mock.AsyncMock()
+        mock_builder.build.return_value = (
+            "test-pipelinerun",
+            {
+                "status": {
+                    "results": [
+                        {"name": "IMAGE_URL", "value": "quay.io/test/image:test-fbc-1.0.0-2"},
+                        {"name": "IMAGE_DIGEST", "value": "sha256:def456"},
+                    ]
+                }
+            },
+        )
         mock_builder_class.return_value = mock_builder
 
         mock_importer = mock.AsyncMock()
@@ -297,6 +338,17 @@ async def mock_fbc_search(*args, **kwargs):
         mock_rebaser_class.return_value = mock_rebaser
 
         mock_builder = mock.AsyncMock()
+        mock_builder.build.return_value = (
+            "test-pipelinerun",
+            {
+                "status": {
+                    "results": [
+                        {"name": "IMAGE_URL", "value": "quay.io/test/image:test-operator-1-fbc-1.0.0-1"},
+                        {"name": "IMAGE_DIGEST", "value": "sha256:abc123"},
+                    ]
+                }
+            },
+        )
         mock_builder_class.return_value = mock_builder
 
         mock_importer = mock.AsyncMock()

elliott/elliottlib/cli/find_builds_cli.py

@@ -857,5 +857,6 @@ async def find_builds_konflux_all_types(runtime: Runtime) -> dict[str, list]:
         'non_payload': sorted([record.nvr for _, is_payload, record in records_with_olm if not is_payload]),
         'olm_builds': sorted([b.nvr for b in olm_records]),
         'olm_builds_not_found': sorted([b.nvr for b in olm_records_not_found]),
+        'olm_operator_nvrs': sorted([b.nvr for b in operator_builds]),
     }
     return builds_tuple

pyartcd/pyartcd/__main__.py

@@ -18,6 +18,7 @@
     cleanup_locks,
     fbc_import_from_index,
     gen_assembly,
+    gen_assembly_lp,
     images_health,
     layered_products_scan_konflux,
     monitor_nightly_delays,
@@ -31,6 +32,7 @@
     olm_bundle_konflux,
     operator_sdk_sync,
     prepare_release_konflux,
+    prepare_release_lp,
     promote,
     quay_doomsday_backup,
     rebuild,
@@ -76,6 +78,7 @@
     "cleanup_locks",
     "fbc_import_from_index",
     "gen_assembly",
+    "gen_assembly_lp",
     "images_health",
     "layered_products_scan_konflux",
     "monitor_nightly_delays",
@@ -89,6 +92,7 @@
     "olm_bundle_konflux",
     "operator_sdk_sync",
     "prepare_release_konflux",
+    "prepare_release_lp",
     "promote",
     "quay_doomsday_backup",
     "rebuild",