From 34f246b42e019e4c10522acbb316f363c18d0b87 Mon Sep 17 00:00:00 2001
From: Dan Manor <dmanor@redhat.com>
Date: Tue, 23 Jun 2026 08:10:35 -0400
Subject: [PATCH] Add promoted component images for OSAC Netris CI

Add container and code images that will be promoted to the
osac-project/latest imagestream for cross-repo import:

- osac-operator: add osac-operator-code (source image)
- fulfillment-service: add fulfillment-service (container image),
  fulfillment-service-code (source image)
- osac-aap: add osac-aap-ee (execution environment image)

These images are prerequisites for the Netris CI workflow which
imports them as base_images when testing other components.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../osac-project-fulfillment-service-main.yaml           | 9 ++++++---
 .../osac-aap/osac-project-osac-aap-main.yaml             | 5 ++---
 .../osac-operator/osac-project-osac-operator-main.yaml   | 9 +++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ci-operator/config/osac-project/fulfillment-service/osac-project-fulfillment-service-main.yaml b/ci-operator/config/osac-project/fulfillment-service/osac-project-fulfillment-service-main.yaml
index e1d7ad46dd3e0..2edf65a6e0cf4 100644
--- a/ci-operator/config/osac-project/fulfillment-service/osac-project-fulfillment-service-main.yaml
+++ b/ci-operator/config/osac-project/fulfillment-service/osac-project-fulfillment-service-main.yaml
@@ -35,7 +35,11 @@ images:
           source_path: /tmp/osac
     to: osac-cli
   - dockerfile_path: Containerfile
-    to: fulfillment-service-pr
+    to: fulfillment-service
+  - dockerfile_literal: |
+      FROM src
+    from: src
+    to: fulfillment-service-code
   - dockerfile_literal: |
       FROM osac-installer
       COPY manifests/ /installer/base/osac-fulfillment-service/manifests/
@@ -52,7 +56,6 @@ images:
 promotion:
   to:
   - excluded_images:
-    - fulfillment-service-pr
     - osac-installer-with-pr
     name: latest
     namespace: osac-project
@@ -81,7 +84,7 @@ tests:
   skip_if_only_changed: ^.*\.(md|adoc)$|^LICENSE$|^\.github/workflows/
   steps:
     dependencies:
-      COMPONENT_IMAGE: fulfillment-service-pr
+      COMPONENT_IMAGE: fulfillment-service
       OSAC_INSTALLER_IMAGE: osac-installer-with-pr
       OSAC_TEST_IMAGE: osac-test-infra
     env:
diff --git a/ci-operator/config/osac-project/osac-aap/osac-project-osac-aap-main.yaml b/ci-operator/config/osac-project/osac-aap/osac-project-osac-aap-main.yaml
index 937b2d27ab38a..39a6939921918 100644
--- a/ci-operator/config/osac-project/osac-aap/osac-project-osac-aap-main.yaml
+++ b/ci-operator/config/osac-project/osac-aap/osac-project-osac-aap-main.yaml
@@ -45,7 +45,7 @@ images:
         paths:
         - destination_dir: .
           source_path: /usr/bin/oc
-    to: osac-aap-pr
+    to: osac-aap-ee
   - dockerfile_literal: |
       FROM osac-installer
       COPY config/ /installer/base/osac-aap/config/
@@ -62,7 +62,6 @@ images:
 promotion:
   to:
   - excluded_images:
-    - osac-aap-pr
     - osac-installer-with-pr
     name: latest
     namespace: osac-project
@@ -86,7 +85,7 @@ tests:
   skip_if_only_changed: ^(README\.md|AGENTS\.md|CLAUDE\.md|docs/.*|samples/.*|charts/.*|\.github/workflows/.*|\.ansible-lint.*|OWNERS|LICENSE)$
   steps:
     dependencies:
-      COMPONENT_IMAGE: osac-aap-pr
+      COMPONENT_IMAGE: osac-aap-ee
       OSAC_INSTALLER_IMAGE: osac-installer-with-pr
       OSAC_TEST_IMAGE: osac-test-infra
     env:
diff --git a/ci-operator/config/osac-project/osac-operator/osac-project-osac-operator-main.yaml b/ci-operator/config/osac-project/osac-operator/osac-project-osac-operator-main.yaml
index c89c38fe76690..0f8051eec3617 100644
--- a/ci-operator/config/osac-project/osac-operator/osac-project-osac-operator-main.yaml
+++ b/ci-operator/config/osac-project/osac-operator/osac-project-osac-operator-main.yaml
@@ -20,8 +20,10 @@ images:
   items:
   - dockerfile_path: Containerfile
     to: osac-operator
-  - dockerfile_path: Containerfile
-    to: osac-operator-pr
+  - dockerfile_literal: |
+      FROM src
+    from: src
+    to: osac-operator-code
   - dockerfile_literal: |
       FROM osac-installer
       COPY config/ /installer/base/osac-operator/config/
@@ -34,7 +36,6 @@ images:
 promotion:
   to:
   - excluded_images:
-    - osac-operator-pr
     - osac-installer-with-pr
     name: latest
     namespace: osac-project
@@ -58,7 +59,7 @@ tests:
   skip_if_only_changed: ^(README\.md|AGENTS\.md|CLAUDE\.md|docs/.*|\.ai-bot/.*|\.claude/rules/.*|\.golangci\.yml|\.yamllint\.yaml|\.pre-commit-config.*\.yaml|\.dockerignore|\.gitattributes|OWNERS|LICENSE|bin/.*)$
   steps:
     dependencies:
-      COMPONENT_IMAGE: osac-operator-pr
+      COMPONENT_IMAGE: osac-operator
       OSAC_INSTALLER_IMAGE: osac-installer-with-pr
       OSAC_TEST_IMAGE: osac-test-infra
     env: