openshift-os: promote openshift-os-src image

This image contains just the source code of openshift/os, so that okd-machine-os could reuse some overlays, instead of importing openshift-os as a submodule. Other images are not referring to this image, so it would not be included in the payload
openshift · Oct 10, 2022 · cc18db2 · cc18db2
1 parent 4bb932a
commit cc18db2
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 0 deletions.
diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml
@@ -3,6 +3,10 @@ base_images:
     name: coreos-assembler
     namespace: coreos
     tag: latest
+  ubi_minimal:
+    name: ubi-minimal
+    namespace: ocp
+    tag: "8"
 build_root:
   image_stream_tag:
     name: fcos-buildroot
@@ -34,6 +38,17 @@ images:
       as:
       - registry.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-image
+- dockerfile_literal: |
+    # just the source code
+    FROM registry.access.redhat.com/ubi9/ubi-minimal
+    WORKDIR /src
+    # Copy the source code
+    COPY . .
+  inputs:
+    ubi_minimal:
+      as:
+      - registry.access.redhat.com/ubi9/ubi-minimal
+  to: openshift-os-src
 promotion:
   excluded_images:
   - build-image

diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.12.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.12.yaml
@@ -3,6 +3,10 @@ base_images:
     name: coreos-assembler
     namespace: coreos
     tag: latest
+  ubi_minimal:
+    name: ubi-minimal
+    namespace: ocp
+    tag: "8"
 build_root:
   image_stream_tag:
     name: fcos-buildroot
@@ -34,6 +38,17 @@ images:
       as:
       - registry.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-image
+- dockerfile_literal: |
+    # just the source code
+    FROM registry.access.redhat.com/ubi9/ubi-minimal
+    WORKDIR /src
+    # Copy the source code
+    COPY . .
+  inputs:
+    ubi_minimal:
+      as:
+      - registry.access.redhat.com/ubi9/ubi-minimal
+  to: openshift-os-src
 promotion:
   disabled: true
   excluded_images:

diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.13.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.13.yaml
@@ -3,6 +3,10 @@ base_images:
     name: coreos-assembler
     namespace: coreos
     tag: latest
+  ubi_minimal:
+    name: ubi-minimal
+    namespace: ocp
+    tag: "8"
 build_root:
   image_stream_tag:
     name: fcos-buildroot
@@ -34,6 +38,17 @@ images:
       as:
       - registry.ci.openshift.org/coreos/coreos-assembler:latest
   to: build-image
+- dockerfile_literal: |
+    # just the source code
+    FROM registry.access.redhat.com/ubi9/ubi-minimal
+    WORKDIR /src
+    # Copy the source code
+    COPY . .
+  inputs:
+    ubi_minimal:
+      as:
+      - registry.access.redhat.com/ubi9/ubi-minimal
+  to: openshift-os-src
 promotion:
   excluded_images:
   - build-image

diff --git a/core-services/image-mirroring/openshift/mapping_origin_4_12 b/core-services/image-mirroring/openshift/mapping_origin_4_12
@@ -245,6 +245,7 @@ registry.ci.openshift.org/origin/4.12:okd-rpms quay.io/openshift/origin-okd-rpms
 registry.ci.openshift.org/origin/4.12:olm-rukpak quay.io/openshift/origin-olm-rukpak:4.12 quay.io/openshift/origin-olm-rukpak:4.12.0 quay.io/openshift/origin-olm-rukpak:latest
 registry.ci.openshift.org/origin/4.12:openshift-apiserver quay.io/openshift/origin-openshift-apiserver:4.12 quay.io/openshift/origin-openshift-apiserver:4.12.0 quay.io/openshift/origin-openshift-apiserver:latest
 registry.ci.openshift.org/origin/4.12:openshift-controller-manager quay.io/openshift/origin-openshift-controller-manager:4.12 quay.io/openshift/origin-openshift-controller-manager:4.12.0 quay.io/openshift/origin-openshift-controller-manager:latest
+registry.ci.openshift.org/origin/4.12:openshift-os-src quay.io/openshift/origin-openshift-os-src:4.12 quay.io/openshift/origin-openshift-os-src:4.12.0 quay.io/openshift/origin-openshift-os-src:latest
 registry.ci.openshift.org/origin/4.12:openshift-state-metrics quay.io/openshift/origin-openshift-state-metrics:4.12 quay.io/openshift/origin-openshift-state-metrics:4.12.0 quay.io/openshift/origin-openshift-state-metrics:latest
 registry.ci.openshift.org/origin/4.12:openstack-cinder-csi-driver quay.io/openshift/origin-openstack-cinder-csi-driver:4.12 quay.io/openshift/origin-openstack-cinder-csi-driver:4.12.0 quay.io/openshift/origin-openstack-cinder-csi-driver:latest
 registry.ci.openshift.org/origin/4.12:openstack-cinder-csi-driver-operator quay.io/openshift/origin-openstack-cinder-csi-driver-operator:4.12 quay.io/openshift/origin-openstack-cinder-csi-driver-operator:4.12.0 quay.io/openshift/origin-openstack-cinder-csi-driver-operator:latest