fix: address review findings in LP pipeline PR

- Fix pullspec parsing to preserve registry ports (rsplit vs split)
- Raise RuntimeError on unknown operator identity in FBC validation
  instead of silently skipping the consistency check
- Fix test_extract_nvrs_skips_validation_for_single_pullspec to
  actually exercise the single-pullspec code path
- Document single-level inheritance limitation in docstrings

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

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

Author: ashwindasr

doozer/doozerlib/cli/fbc.py

@@ -679,7 +679,7 @@ async def _rebase_and_build(
         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 ""
+        pullspec = f"{image_url.rsplit(':', 1)[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

pyartcd/pyartcd/fbc_util.py

@@ -116,16 +116,14 @@ async def validate_fbc_related_images(fbc_pullspecs: List[str], product: str) ->
                             operator,
                         )
                     else:
-                        operator = f"UNKNOWN-{hash(fbc_pullspec) & 0xFFFFFFFF:08x}"
-                        logger.error(
-                            "Could not determine operator for %s (nvr=%s), using: %s",
-                            fbc_pullspec,
-                            nvr,
-                            operator,
+                        raise RuntimeError(
+                            f"Could not determine operator for FBC {fbc_pullspec} (nvr={nvr}). "
+                            f"Cannot validate related-image consistency without operator identity."
                         )
+                except RuntimeError:
+                    raise
                 except Exception as e:
-                    logger.error("Failed to extract operator from %s: %s", fbc_pullspec, e)
-                    operator = f"UNKNOWN-{hash(fbc_pullspec) & 0xFFFFFFFF:08x}"
+                    raise RuntimeError(f"Failed to extract operator from {fbc_pullspec}: {e}") from e
 
         fbc_to_operator[fbc_pullspec] = operator
 

pyartcd/pyartcd/pipelines/gen_assembly_lp.py

@@ -217,7 +217,12 @@ def _apply_extra_image_nvrs(self, operand_map: Dict[str, str]) -> Dict[str, str]
         return operand_map
 
     async def _resolve_parent_operands(self) -> Dict[str, str]:
-        """Resolve the full operand set from the parent (basis) assembly."""
+        """Resolve the full operand set from the parent (basis) assembly.
+
+        NOTE: Only resolves one level of inheritance. Multi-level chains
+        (A->B->C) are not supported; the basis assembly must list all
+        operands explicitly.
+        """
         self._logger.info("Resolving operand set from basis assembly '%s'...", self.basis_assembly)
 
         build_data_path = self._working_dir / "ocp-build-data-read"

pyartcd/pyartcd/pipelines/prepare_release_lp.py

@@ -222,6 +222,11 @@ def _extract_operand_nvrs(self, assembly_config: Dict) -> List[str]:
         """Extract pinned operand NVRs from the assembly definition.
 
         Walks the members.images list and collects NVRs from is.nvr or is.nvr! entries.
+
+        NOTE: For inherited (delta) assemblies, only NVRs explicitly listed
+        in this assembly's members.images are returned. Parent chain
+        resolution is not performed -- doozer/elliott commands handle
+        inheritance internally via --assembly.
         """
         members_images = assembly_config.get('assembly', {}).get('members', {}).get('images', [])
         nvrs = []

pyartcd/tests/pipelines/test_gen_assembly_lp.py

@@ -291,18 +291,23 @@ def test_extract_nvrs_calls_validation_for_multiple_pullspecs(self, mock_validat
         self.assertIn("cluster-logging-operator", result)
 
     @patch('pyartcd.pipelines.gen_assembly_lp.validate_fbc_related_images', new_callable=AsyncMock)
-    def test_extract_nvrs_skips_validation_for_single_pullspec(self, mock_validate):
+    @patch('elliottlib.util.extract_nvrs_from_fbc', new_callable=AsyncMock)
+    def test_extract_nvrs_skips_validation_for_single_pullspec(self, mock_extract_nvrs, mock_validate):
         """When only one FBC pullspec is provided, skip validation and extract directly."""
+        mock_extract_nvrs.return_value = [
+            "cluster-logging-operator-6.4.1-1",
+            "log-file-metric-exporter-6.4.1-1",
+        ]
         pipeline = self._make_pipeline(
             fbc_pullspecs=["quay.io/test/fbc@sha256:single"],
         )
 
-        with patch('pyartcd.pipelines.gen_assembly_lp.GenAssemblyLPPipeline._extract_nvrs_from_fbc') as mock_extract:
-            mock_extract.return_value = {"some-container": "some-container-6.4.1-1"}
-            # Just verify the method exists and is callable
-            self.assertTrue(callable(pipeline._extract_nvrs_from_fbc))
+        result = asyncio.run(pipeline._extract_nvrs_from_fbc())
 
         mock_validate.assert_not_called()
+        mock_extract_nvrs.assert_called_once_with("quay.io/test/fbc@sha256:single", "openshift-logging")
+        self.assertIn("cluster-logging-operator", result)
+        self.assertIn("log-file-metric-exporter", result)
 
     @patch('pyartcd.pipelines.gen_assembly_lp.extract_fbc_labels', new_callable=AsyncMock)
     def test_build_fbc_pullspecs_map(self, mock_labels):