From 0f8bfa00f770f41c28547d031faab36790faffc8 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 21 Apr 2026 21:40:04 -0400 Subject: [PATCH] openshift/os: update ci-operator configs for build-args changes In https://github.com/openshift/os/pull/1919, we're changing the openshift/os Containerfile to use ARG IMAGE_FROM=overridden instead of a hardcoded FROM, and to require IMAGE_NAME/IMAGE_CPE build args for RHCOS builds. So we need to adapt the `as` substitution here accordingly. Unfortunately, ci-operator (but really, Builds v1) doesn't support build args files so here we're just hardcoding values for the parameter for CI to build. This is something we'd be able to fix once CI also uses Konflux. Yes, the literal `${IMAGE_FROM}` is intended because the substitution needs to match against the raw string in the Dockerfile AIUI. Keep the old value too so that we can merge this PR and not break openshift/os CI before merging https://github.com/openshift/os/pull/1919. Assisted-by: OpenCode (Claude Opus 4.6) --- ci-operator/config/openshift/os/openshift-os-master.yaml | 5 +++++ .../config/openshift/os/openshift-os-master__okd-scos.yaml | 1 + 2 files changed, 6 insertions(+) diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml index a7b0e81e37a88..e5de785a0e80e 100644 --- a/ci-operator/config/openshift/os/openshift-os-master.yaml +++ b/ci-operator/config/openshift/os/openshift-os-master.yaml @@ -13,11 +13,16 @@ images: - build_args: - name: OPENSHIFT_CI value: "1" + - name: IMAGE_NAME + value: openshift/ose-rhel-coreos-9 + - name: IMAGE_CPE + value: cpe:/a:redhat:openshift:4.22::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: - name: OPENSHIFT_CI 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 3b8f6c6c0e4a7..d1b68f5c8c606 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 @@ -22,6 +22,7 @@ images: stream-coreos-base: as: - quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos + - ${IMAGE_FROM} to: os-image - build_args: - name: OPENSHIFT_CI