From 79da32f7aafaf9984f09d058fe55223989e1ec6e Mon Sep 17 00:00:00 2001 From: "D. Paolella" Date: Thu, 9 Apr 2026 15:51:00 +0200 Subject: [PATCH 1/5] Add rhcos node-image definition rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED --- images/rhcos-node-image.yml | 26 ++++++++++++++++++++++++++ streams.yml | 3 +++ 2 files changed, 29 insertions(+) create mode 100644 images/rhcos-node-image.yml diff --git a/images/rhcos-node-image.yml b/images/rhcos-node-image.yml new file mode 100644 index 0000000000..df627d5793 --- /dev/null +++ b/images/rhcos-node-image.yml @@ -0,0 +1,26 @@ +content: + source: + dockerfile: Containerfile + git: + branch: + target: release-{MAJOR}.{MINOR} + url: git@github.com:openshift-priv/os.git + web: https://github.com/openshift/os + ci_alignment: + streams_prs: + enabled: false + mirror: false +distgit: + branch: rhaos-{MAJOR}.{MINOR}-rhel-9 + component: rhcos-node-image-container +for_payload: false +for_release: false +from: + builder: + - stream: rhel_coreos +name: openshift/rhcos-node-image-rhel9 +owners: +- aos-team-art@redhat.com +canonical_builders_from_upstream: false +okd: + mode: disabled diff --git a/streams.yml b/streams.yml index c3a8c96d18..4d99c147fa 100644 --- a/streams.yml +++ b/streams.yml @@ -82,3 +82,6 @@ centos_stream10: upstream_image: registry.ci.openshift.org/ocp/builder:stream10 mirror: true mirror_manifest_list: true + +rhel_coreos: + image: quay.io/openshift-release-dev/ocp-v4.0-art-dev:rhel-9.8-coreos From 2cdb854ea96edd013a06997e2353d6eebe6219fa Mon Sep 17 00:00:00 2001 From: "D. Paolella" Date: Thu, 9 Apr 2026 18:01:15 +0200 Subject: [PATCH 2/5] Add enabled_repos to rhcos-node-image for RPM installation The rhcos-node-image build requires access to RHEL 9 repositories to install OpenShift-specific RPMs (cri-o, openshift-kubelet, openvswitch, etc.) via rpm-ostree during the build-node-image.sh script. Repos added: - rhel-9-baseos-rpms - rhel-9-appstream-rpms - rhel-9-fast-datapath-rpms - rhel-9-server-ose-rpms rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED --- images/rhcos-node-image.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/rhcos-node-image.yml b/images/rhcos-node-image.yml index df627d5793..93ab758e60 100644 --- a/images/rhcos-node-image.yml +++ b/images/rhcos-node-image.yml @@ -13,6 +13,11 @@ content: distgit: branch: rhaos-{MAJOR}.{MINOR}-rhel-9 component: rhcos-node-image-container +enabled_repos: +- rhel-9-baseos-rpms +- rhel-9-appstream-rpms +- rhel-9-fast-datapath-rpms +- rhel-9-server-ose-rpms for_payload: false for_release: false from: From 6bea620a3187154be19cc9f33b3409c4838fbdc9 Mon Sep 17 00:00:00 2001 From: "D. Paolella" Date: Fri, 10 Apr 2026 17:38:32 +0200 Subject: [PATCH 3/5] Use RHEL 9.8 repos for rhcos-node-image Co-Authored-By: Claude Sonnet 4.5 rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED --- images/rhcos-node-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/rhcos-node-image.yml b/images/rhcos-node-image.yml index 93ab758e60..7a2f9e96e7 100644 --- a/images/rhcos-node-image.yml +++ b/images/rhcos-node-image.yml @@ -14,10 +14,10 @@ distgit: branch: rhaos-{MAJOR}.{MINOR}-rhel-9 component: rhcos-node-image-container enabled_repos: -- rhel-9-baseos-rpms -- rhel-9-appstream-rpms - rhel-9-fast-datapath-rpms - rhel-9-server-ose-rpms +- rhel-98-baseos +- rhel-98-appstream for_payload: false for_release: false from: From 059634a793ce6c1834537ab424bf0c15ff05fbcc Mon Sep 17 00:00:00 2001 From: "D. Paolella" Date: Mon, 13 Apr 2026 18:34:28 +0200 Subject: [PATCH 4/5] Fix base image pullspec + network_mode: open --- images/rhcos-node-image.yml | 11 +++++--- repos/rhel-9.8-appstream.yml | 17 ++++++++++++ repos/rhel-9.8-baseos.yml | 15 +++++++++++ repos/rhel-9.8-early-kernel.yml | 15 +++++++++++ repos/rhel-9.8-fast-datapath.yml | 21 +++++++++++++++ repos/rhel-9.8-server-ose-4.22.yml | 43 ++++++++++++++++++++++++++++++ streams.yml | 2 +- 7 files changed, 119 insertions(+), 5 deletions(-) create mode 100644 repos/rhel-9.8-appstream.yml create mode 100644 repos/rhel-9.8-baseos.yml create mode 100644 repos/rhel-9.8-early-kernel.yml create mode 100644 repos/rhel-9.8-fast-datapath.yml create mode 100644 repos/rhel-9.8-server-ose-4.22.yml diff --git a/images/rhcos-node-image.yml b/images/rhcos-node-image.yml index 7a2f9e96e7..857ead873e 100644 --- a/images/rhcos-node-image.yml +++ b/images/rhcos-node-image.yml @@ -14,10 +14,11 @@ distgit: branch: rhaos-{MAJOR}.{MINOR}-rhel-9 component: rhcos-node-image-container enabled_repos: -- rhel-9-fast-datapath-rpms -- rhel-9-server-ose-rpms -- rhel-98-baseos -- rhel-98-appstream +- rhel-9.8-baseos +- rhel-9.8-appstream +- rhel-9.8-early-kernel +- rhel-9.8-fast-datapath +- rhel-9.8-server-ose-4.22 for_payload: false for_release: false from: @@ -27,5 +28,7 @@ name: openshift/rhcos-node-image-rhel9 owners: - aos-team-art@redhat.com canonical_builders_from_upstream: false +konflux: + network_mode: open okd: mode: disabled diff --git a/repos/rhel-9.8-appstream.yml b/repos/rhel-9.8-appstream.yml new file mode 100644 index 0000000000..9c4620df83 --- /dev/null +++ b/repos/rhel-9.8-appstream.yml @@ -0,0 +1,17 @@ +- conf: + baseurl: + x86_64: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/AppStream/x86_64/os/ + aarch64: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/AppStream/aarch64/os/ + ppc64le: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/AppStream/ppc64le/os/ + s390x: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/AppStream/s390x/os/ + extra_options: + gpgcheck: '1' + content_set: + aarch64: rhel-9-for-aarch64-appstream-rpms + default: rhel-9-for-x86_64-appstream-rpms + ppc64le: rhel-9-for-ppc64le-appstream-rpms + s390x: rhel-9-for-s390x-appstream-rpms + name: rhel-9.8-appstream + reposync: + enabled: true + type: external diff --git a/repos/rhel-9.8-baseos.yml b/repos/rhel-9.8-baseos.yml new file mode 100644 index 0000000000..ec7680b127 --- /dev/null +++ b/repos/rhel-9.8-baseos.yml @@ -0,0 +1,15 @@ +- conf: + baseurl: + x86_64: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/BaseOS/x86_64/os/ + aarch64: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/BaseOS/aarch64/os/ + ppc64le: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/BaseOS/ppc64le/os/ + s390x: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/BaseOS/s390x/os/ + extra_options: + excludepkgs: toolbox* + gpgcheck: '1' + content_set: + optional: true + name: rhel-9.8-baseos + reposync: + enabled: true + type: external diff --git a/repos/rhel-9.8-early-kernel.yml b/repos/rhel-9.8-early-kernel.yml new file mode 100644 index 0000000000..e9efcf510c --- /dev/null +++ b/repos/rhel-9.8-early-kernel.yml @@ -0,0 +1,15 @@ +- conf: + baseurl: + x86_64: https://ocp-artifacts.engineering.redhat.com/pub/RHOCP/plashets/4.22/stream/el9/latest/x86_64/os + aarch64: https://ocp-artifacts.engineering.redhat.com/pub/RHOCP/plashets/4.22/stream/el9/latest/aarch64/os + ppc64le: https://ocp-artifacts.engineering.redhat.com/pub/RHOCP/plashets/4.22/stream/el9/latest/ppc64le/os + s390x: https://ocp-artifacts.engineering.redhat.com/pub/RHOCP/plashets/4.22/stream/el9/latest/s390x/os + extra_options: + includepkgs: kernel,kernel-*,toolbox* + gpgcheck: '1' + content_set: + optional: true + name: rhel-9.8-early-kernel + reposync: + enabled: true + type: external diff --git a/repos/rhel-9.8-fast-datapath.yml b/repos/rhel-9.8-fast-datapath.yml new file mode 100644 index 0000000000..add8a0eb9a --- /dev/null +++ b/repos/rhel-9.8-fast-datapath.yml @@ -0,0 +1,21 @@ +- conf: + baseurl: + aarch64: https://rhsm-pulp.corp.redhat.com/content/dist/layered/rhel9/aarch64/fast-datapath/os/ + ppc64le: https://rhsm-pulp.corp.redhat.com/content/dist/layered/rhel9/ppc64le/fast-datapath/os/ + s390x: https://rhsm-pulp.corp.redhat.com/content/dist/layered/rhel9/s390x/fast-datapath/os/ + x86_64: https://rhsm-pulp.corp.redhat.com/content/dist/layered/rhel9/x86_64/fast-datapath/os/ + ci_alignment: + localdev: + enabled: true + profiles: + - el9 + content_set: + aarch64: fast-datapath-for-rhel-9-aarch64-rpms + default: fast-datapath-for-rhel-9-x86_64-rpms + optional: true + ppc64le: fast-datapath-for-rhel-9-ppc64le-rpms + s390x: fast-datapath-for-rhel-9-s390x-rpms + name: rhel-9.8-fast-datapath + reposync: + enabled: true + type: external diff --git a/repos/rhel-9.8-server-ose-4.22.yml b/repos/rhel-9.8-server-ose-4.22.yml new file mode 100644 index 0000000000..a51a4811bb --- /dev/null +++ b/repos/rhel-9.8-server-ose-4.22.yml @@ -0,0 +1,43 @@ +- conf: + ci_alignment: + localdev: + enabled: true + profiles: + - el9 + extra_options: + module_hotfixes: 1 + content_set: + optional: true + name: rhel-9.8-server-ose-4.22 + plashet: + assembly_aware: true + embargo_aware: true + include_previous_packages: + - conmon + - cri-o + - cri-tools + - crun + - haproxy + - ignition + - kernel + - kernel-rt + - libreswan + - nmstate + - openshift + - openvswitch + - ovn + - podman + - python3-openvswitch + - spdlog + slug: el9 + source: + embargoed_tags: + - rhaos-{MAJOR}.{MINOR}-rhel-9-embargoed + from_tags: + - name: rhaos-{MAJOR}.{MINOR}-rhel-9-candidate + product_version: OSE-{MAJOR}.{MINOR}-RHEL-9 + release_tag: rhaos-{MAJOR}.{MINOR}-rhel-9 + type: brew + reposync: + latest_only: false + type: plashet diff --git a/streams.yml b/streams.yml index 4d99c147fa..679fca73ab 100644 --- a/streams.yml +++ b/streams.yml @@ -84,4 +84,4 @@ centos_stream10: mirror_manifest_list: true rhel_coreos: - image: quay.io/openshift-release-dev/ocp-v4.0-art-dev:rhel-9.8-coreos + image: registry.ci.openshift.org/coreos/rhel-coreos-base:9.8 From cebd198ab370bbb6517d750c883733e4db8ef6c7 Mon Sep 17 00:00:00 2001 From: "D. Paolella" Date: Mon, 13 Apr 2026 18:41:29 +0200 Subject: [PATCH 5/5] Test from fork rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED --- group.yml | 2 ++ images/rhcos-node-image.yml | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/group.yml b/group.yml index 14c59a0468..7bd9a1b8d0 100644 --- a/group.yml +++ b/group.yml @@ -217,6 +217,8 @@ public_upstreams: public: "https://github.com/openshift-eng/ocp-build-data" - private: "https://github.com/openshift-priv/assisted-installer-ui" public: "https://github.com/openshift-assisted/assisted-installer-ui" +- private: "git@github.com:openshift-priv/os.git" + public: "git@github.com:thegreyd/os.git" default_image_build_method: osbs2 image_build_log_scanner: diff --git a/images/rhcos-node-image.yml b/images/rhcos-node-image.yml index 857ead873e..e5f169f592 100644 --- a/images/rhcos-node-image.yml +++ b/images/rhcos-node-image.yml @@ -5,6 +5,7 @@ content: branch: target: release-{MAJOR}.{MINOR} url: git@github.com:openshift-priv/os.git + url_pull: git@github.com:thegreyd/os.git web: https://github.com/openshift/os ci_alignment: streams_prs: @@ -14,11 +15,10 @@ distgit: branch: rhaos-{MAJOR}.{MINOR}-rhel-9 component: rhcos-node-image-container enabled_repos: -- rhel-9.8-baseos -- rhel-9.8-appstream -- rhel-9.8-early-kernel -- rhel-9.8-fast-datapath -- rhel-9.8-server-ose-4.22 +- rhel-9-fast-datapath-rpms +- rhel-9-server-ose-rpms +- rhel-98-baseos +- rhel-98-appstream for_payload: false for_release: false from: