Skip to content

openshift/os: adapt for more build-args changes #79631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
May 21, 2026
Merged

openshift/os: adapt for more build-args changes #79631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ci-operator/config/openshift/os/openshift-os-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
5 changes: 4 additions & 1 deletion ci-operator/config/openshift/os/openshift-os-master__okd-scos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 10 additions & 3 deletions ci-operator/config/openshift/os/openshift-os-release-5.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
13 changes: 10 additions & 3 deletions ci-operator/config/openshift/os/openshift-os-release-5.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down