From 7c98f6b00f383c15b21f2cfd722e677e4a270950 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Thu, 21 May 2026 14:34:50 -0400 Subject: [PATCH] openshift/os: adapt for more build-args changes We added the OPENSHIFT_VERSION and YUM_REPO_NAMES build args in https://github.com/openshift/os/pull/1935 so let's add them here. Also drop the quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos references because we don't have that defined in our containerfile anymore. --- .../config/openshift/os/openshift-os-master.yaml | 13 ++++++++++--- .../openshift/os/openshift-os-master__okd-scos.yaml | 5 ++++- .../openshift/os/openshift-os-release-5.0.yaml | 13 ++++++++++--- .../openshift/os/openshift-os-release-5.1.yaml | 13 ++++++++++--- 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml index 84c77bb5ca6ab..c549abb97eb69 100644 --- a/ci-operator/config/openshift/os/openshift-os-master.yaml +++ b/ci-operator/config/openshift/os/openshift-os-master.yaml @@ -17,15 +17,18 @@ images: - build_args: - name: OPENSHIFT_CI value: "1" + - name: OPENSHIFT_VERSION + value: "5.0" + - name: YUM_REPO_NAMES + value: rhel-9.8-baseos,rhel-9.8-appstream,rhel-9.8-early-kernel,rhel-9.8-fast-datapath,rhel-9.8-server-ose-5.0 - name: IMAGE_NAME value: openshift/ose-rhel-coreos-9 - name: IMAGE_CPE - value: cpe:/a:redhat:openshift:4.22::el9 + value: cpe:/a:redhat:openshift:5.0::el9 dockerfile_path: Containerfile inputs: rhel-coreos-base: as: - - quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos - ${IMAGE_FROM} to: rhel-coreos - build_args: @@ -40,10 +43,14 @@ images: - build_args: - name: OPENSHIFT_CI value: "1" + - name: OPENSHIFT_VERSION + value: "5.0" + - name: YUM_REPO_NAMES + value: rhel-10.2-baseos,rhel-10.2-appstream,rhel-10.2-early-kernel,rhel-10.2-fast-datapath,rhel-10.2-server-ose-5.0 - name: IMAGE_NAME value: openshift/ose-rhel-coreos-10 - name: IMAGE_CPE - value: cpe:/a:redhat:openshift:4.22::el10 + value: cpe:/a:redhat:openshift:5.0::el10 dockerfile_path: Containerfile inputs: rhel-coreos-base-10: diff --git a/ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml b/ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml index d1b68f5c8c606..df6f80d39cf73 100644 --- a/ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml +++ b/ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml @@ -17,11 +17,14 @@ images: - build_args: - name: OPENSHIFT_CI value: "1" + - name: OPENSHIFT_VERSION + value: "5.0" + - name: YUM_REPO_NAMES + value: c10s-baseos,c10s-appstream,c10s-sig-nfv,c10s-sig-cloud-okd,rhel-10.2-server-ose-5.0 dockerfile_path: Containerfile inputs: stream-coreos-base: as: - - quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos - ${IMAGE_FROM} to: os-image - build_args: diff --git a/ci-operator/config/openshift/os/openshift-os-release-5.0.yaml b/ci-operator/config/openshift/os/openshift-os-release-5.0.yaml index d419570db932f..049ea147498ce 100644 --- a/ci-operator/config/openshift/os/openshift-os-release-5.0.yaml +++ b/ci-operator/config/openshift/os/openshift-os-release-5.0.yaml @@ -17,15 +17,18 @@ images: - build_args: - name: OPENSHIFT_CI value: "1" + - name: OPENSHIFT_VERSION + value: "5.0" + - name: YUM_REPO_NAMES + value: rhel-9.8-baseos,rhel-9.8-appstream,rhel-9.8-early-kernel,rhel-9.8-fast-datapath,rhel-9.8-server-ose-5.0 - name: IMAGE_NAME value: openshift/ose-rhel-coreos-9 - name: IMAGE_CPE - value: cpe:/a:redhat:openshift:4.22::el9 + value: cpe:/a:redhat:openshift:5.0::el9 dockerfile_path: Containerfile inputs: rhel-coreos-base: as: - - quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos - ${IMAGE_FROM} to: rhel-coreos - build_args: @@ -40,10 +43,14 @@ images: - build_args: - name: OPENSHIFT_CI value: "1" + - name: OPENSHIFT_VERSION + value: "5.0" + - name: YUM_REPO_NAMES + value: rhel-10.2-baseos,rhel-10.2-appstream,rhel-10.2-early-kernel,rhel-10.2-fast-datapath,rhel-10.2-server-ose-5.0 - name: IMAGE_NAME value: openshift/ose-rhel-coreos-10 - name: IMAGE_CPE - value: cpe:/a:redhat:openshift:4.22::el10 + value: cpe:/a:redhat:openshift:5.0::el10 dockerfile_path: Containerfile inputs: rhel-coreos-base-10: diff --git a/ci-operator/config/openshift/os/openshift-os-release-5.1.yaml b/ci-operator/config/openshift/os/openshift-os-release-5.1.yaml index 593a387cd948b..4d4ae5cffbd71 100644 --- a/ci-operator/config/openshift/os/openshift-os-release-5.1.yaml +++ b/ci-operator/config/openshift/os/openshift-os-release-5.1.yaml @@ -17,15 +17,18 @@ images: - build_args: - name: OPENSHIFT_CI value: "1" + - name: OPENSHIFT_VERSION + value: "5.1" + - name: YUM_REPO_NAMES + value: rhel-9.8-baseos,rhel-9.8-appstream,rhel-9.8-early-kernel,rhel-9.8-fast-datapath,rhel-9.8-server-ose-5.1 - name: IMAGE_NAME value: openshift/ose-rhel-coreos-9 - name: IMAGE_CPE - value: cpe:/a:redhat:openshift:4.22::el9 + value: cpe:/a:redhat:openshift:5.1::el9 dockerfile_path: Containerfile inputs: rhel-coreos-base: as: - - quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos - ${IMAGE_FROM} to: rhel-coreos - build_args: @@ -40,10 +43,14 @@ images: - build_args: - name: OPENSHIFT_CI value: "1" + - name: OPENSHIFT_VERSION + value: "5.1" + - name: YUM_REPO_NAMES + value: rhel-10.2-baseos,rhel-10.2-appstream,rhel-10.2-early-kernel,rhel-10.2-fast-datapath,rhel-10.2-server-ose-5.1 - name: IMAGE_NAME value: openshift/ose-rhel-coreos-10 - name: IMAGE_CPE - value: cpe:/a:redhat:openshift:4.22::el10 + value: cpe:/a:redhat:openshift:5.1::el10 dockerfile_path: Containerfile inputs: rhel-coreos-base-10: