From a9c1a5dabfe208cb2018817ffee0d4cff9c469c4 Mon Sep 17 00:00:00 2001 From: "D. Paolella" Date: Fri, 10 Apr 2026 18:55:16 +0200 Subject: [PATCH] Use 9.8 repos rh-pre-commit.version: 2.3.2 rh-pre-commit.check-secrets: ENABLED --- images/driver-toolkit.yml | 4 ---- images/ose-frr.yml | 1 - repos/rhel-9-appstream-rpms.yml | 16 ++++++++-------- repos/rhel-9-baseos-rpms.yml | 16 ++++++++-------- repos/rhel-9-codeready-builder-rpms.yml | 16 ++++++++-------- repos/rhel-9-highavailability.yml | 16 ++++++++-------- repos/rhel-9-nfv.yml | 11 ++++++----- repos/rhel-9-rt-rpms.yml | 10 +++++----- repos/rhel-98-appstream.yml | 17 ----------------- repos/rhel-98-baseos.yml | 15 --------------- repos/rhel-98-early-kernel.yml | 15 --------------- repos/rhel-98-highavailability.yml | 14 -------------- repos/rhel-98-nfv.yml | 15 --------------- 13 files changed, 43 insertions(+), 123 deletions(-) delete mode 100644 repos/rhel-98-appstream.yml delete mode 100644 repos/rhel-98-baseos.yml delete mode 100644 repos/rhel-98-early-kernel.yml delete mode 100644 repos/rhel-98-highavailability.yml delete mode 100644 repos/rhel-98-nfv.yml diff --git a/images/driver-toolkit.yml b/images/driver-toolkit.yml index 0f5b17d02f..08393193cb 100644 --- a/images/driver-toolkit.yml +++ b/images/driver-toolkit.yml @@ -32,10 +32,6 @@ enabled_repos: - rhel-9-nfv - rhel-9-highavailability - rhel-9-rt-rpms -- rhel-98-baseos -- rhel-98-appstream -- rhel-98-nfv -- rhel-98-highavailability for_payload: true from: member: openshift-enterprise-base-rhel9 diff --git a/images/ose-frr.yml b/images/ose-frr.yml index 680a26454d..efa8dadca5 100644 --- a/images/ose-frr.yml +++ b/images/ose-frr.yml @@ -16,7 +16,6 @@ delivery: - openshift4/frr-rhel9 enabled_repos: - rhel-9-appstream-rpms -- rhel-98-appstream - rhel-9-baseos-rpms - rhel-9-server-ose-rpms-embargoed for_payload: true diff --git a/repos/rhel-9-appstream-rpms.yml b/repos/rhel-9-appstream-rpms.yml index 2428bec2ed..7d1175ea6d 100644 --- a/repos/rhel-9-appstream-rpms.yml +++ b/repos/rhel-9-appstream-rpms.yml @@ -1,9 +1,9 @@ - conf: baseurl: - aarch64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/aarch64/appstream/os/ - ppc64le: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/ppc64le/appstream/os/ - s390x: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/s390x/appstream/os/ - x86_64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/ + aarch64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/aarch64/appstream/os/ + ppc64le: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/ppc64le/appstream/os/ + s390x: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/s390x/appstream/os/ + x86_64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/x86_64/appstream/os/ ci_alignment: localdev: enabled: true @@ -12,9 +12,9 @@ extra_options: module_hotfixes: 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 + aarch64: rhel-9-for-aarch64-appstream-e4s-rpms__9_DOT_8 + default: rhel-9-for-x86_64-appstream-e4s-rpms__9_DOT_8 + ppc64le: rhel-9-for-ppc64le-appstream-e4s-rpms__9_DOT_8 + s390x: rhel-9-for-s390x-appstream-e4s-rpms__9_DOT_8 name: rhel-9-appstream-rpms type: external diff --git a/repos/rhel-9-baseos-rpms.yml b/repos/rhel-9-baseos-rpms.yml index 3574c54223..d4aff98974 100644 --- a/repos/rhel-9-baseos-rpms.yml +++ b/repos/rhel-9-baseos-rpms.yml @@ -1,9 +1,9 @@ - conf: baseurl: - x86_64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/x86_64/baseos/os/ - aarch64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/aarch64/baseos/os/ - ppc64le: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/ppc64le/baseos/os/ - s390x: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/s390x/baseos/os/ + x86_64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/x86_64/baseos/os/ + aarch64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/aarch64/baseos/os/ + ppc64le: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/ppc64le/baseos/os/ + s390x: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/s390x/baseos/os/ ci_alignment: localdev: enabled: true @@ -12,9 +12,9 @@ extra_options: module_hotfixes: 1 content_set: - aarch64: rhel-9-for-aarch64-baseos-rpms - default: rhel-9-for-x86_64-baseos-rpms - ppc64le: rhel-9-for-ppc64le-baseos-rpms - s390x: rhel-9-for-s390x-baseos-rpms + aarch64: rhel-9-for-aarch64-baseos-e4s-rpms__9_DOT_8 + default: rhel-9-for-x86_64-baseos-e4s-rpms__9_DOT_8 + ppc64le: rhel-9-for-ppc64le-baseos-e4s-rpms__9_DOT_8 + s390x: rhel-9-for-s390x-baseos-e4s-rpms__9_DOT_8 name: rhel-9-baseos-rpms type: external diff --git a/repos/rhel-9-codeready-builder-rpms.yml b/repos/rhel-9-codeready-builder-rpms.yml index 442b3dc108..59dc63ba50 100644 --- a/repos/rhel-9-codeready-builder-rpms.yml +++ b/repos/rhel-9-codeready-builder-rpms.yml @@ -1,18 +1,18 @@ - conf: baseurl: - aarch64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/aarch64/codeready-builder/os/ - ppc64le: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/ppc64le/codeready-builder/os/ - s390x: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/s390x/codeready-builder/os/ - x86_64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/x86_64/codeready-builder/os/ + aarch64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.8/aarch64/codeready-builder/os/ + ppc64le: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.8/ppc64le/codeready-builder/os/ + s390x: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.8/s390x/codeready-builder/os/ + x86_64: https://rhsm-pulp.corp.redhat.com/content/eus/rhel9/9.8/x86_64/codeready-builder/os/ ci_alignment: localdev: enabled: true profiles: - el9 content_set: - aarch64: codeready-builder-for-rhel-9-aarch64-rpms__9_DOT_6 - default: codeready-builder-for-rhel-9-x86_64-rpms__9_DOT_6 - ppc64le: codeready-builder-for-rhel-9-ppc64le-rpms__9_DOT_6 - s390x: codeready-builder-for-rhel-9-s390x-rpms__9_DOT_6 + aarch64: codeready-builder-for-rhel-9-aarch64-eus-rpms__9_DOT_8 + default: codeready-builder-for-rhel-9-x86_64-eus-rpms__9_DOT_8 + ppc64le: codeready-builder-for-rhel-9-ppc64le-eus-rpms__9_DOT_8 + s390x: codeready-builder-for-rhel-9-s390x-eus-rpms__9_DOT_8 name: rhel-9-codeready-builder-rpms type: external diff --git a/repos/rhel-9-highavailability.yml b/repos/rhel-9-highavailability.yml index 0257a2b137..3c728225df 100644 --- a/repos/rhel-9-highavailability.yml +++ b/repos/rhel-9-highavailability.yml @@ -1,15 +1,15 @@ - conf: baseurl: - aarch64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/aarch64/highavailability/os/ - ppc64le: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/ppc64le/highavailability/os/ - s390x: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/s390x/highavailability/os/ - x86_64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/x86_64/highavailability/os/ + aarch64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/aarch64/highavailability/os/ + ppc64le: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/ppc64le/highavailability/os/ + s390x: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/s390x/highavailability/os/ + x86_64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/x86_64/highavailability/os/ extra_options: gpgcheck: '1' content_set: - aarch64: rhel-9-for-aarch64-highavailability-rpms - default: rhel-9-for-x86_64-highavailability-rpms - ppc64le: rhel-9-for-ppc64le-highavailability-rpms - s390x: rhel-9-for-s390x-highavailability-rpms + aarch64: rhel-9-for-aarch64-highavailability-e4s-rpms__9_DOT_8 + default: rhel-9-for-x86_64-highavailability-e4s-rpms__9_DOT_8 + ppc64le: rhel-9-for-ppc64le-highavailability-e4s-rpms__9_DOT_8 + s390x: rhel-9-for-s390x-highavailability-e4s-rpms__9_DOT_8 name: rhel-9-highavailability type: external diff --git a/repos/rhel-9-nfv.yml b/repos/rhel-9-nfv.yml index 09b51831db..3853ba66e3 100644 --- a/repos/rhel-9-nfv.yml +++ b/repos/rhel-9-nfv.yml @@ -1,13 +1,14 @@ - conf: baseurl: - aarch64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/x86_64/nfv/os/ - ppc64le: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/x86_64/nfv/os/ - s390x: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/x86_64/nfv/os/ - x86_64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/x86_64/nfv/os/ + # We only have x86_64 repo for nfv + aarch64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/x86_64/nfv/os/ + ppc64le: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/x86_64/nfv/os/ + s390x: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/x86_64/nfv/os/ + x86_64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/x86_64/nfv/os/ extra_options: gpgcheck: '1' content_set: - default: rhel-9-for-x86_64-nfv-rpms + default: rhel-9-for-x86_64-nfv-e4s-rpms__9_DOT_8 name: rhel-9-nfv reposync: enabled: true diff --git a/repos/rhel-9-rt-rpms.yml b/repos/rhel-9-rt-rpms.yml index 891a3aa932..f53ad205b2 100644 --- a/repos/rhel-9-rt-rpms.yml +++ b/repos/rhel-9-rt-rpms.yml @@ -1,13 +1,13 @@ - conf: baseurl: - aarch64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/x86_64/rt/os/ - ppc64le: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/x86_64/rt/os/ - s390x: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/x86_64/rt/os/ - x86_64: https://rhsm-pulp.corp.redhat.com/content/dist/rhel9/9/x86_64/rt/os/ + aarch64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/x86_64/rt/os/ + ppc64le: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/x86_64/rt/os/ + s390x: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/x86_64/rt/os/ + x86_64: https://rhsm-pulp.corp.redhat.com/content/e4s/rhel9/9.8/x86_64/rt/os/ extra_options: module_hotfixes: 1 content_set: - default: rhel-9-for-x86_64-rt-rpms + default: rhel-9-for-x86_64-rt-e4s-rpms__9_DOT_8 optional: true name: rhel-9-rt-rpms type: external diff --git a/repos/rhel-98-appstream.yml b/repos/rhel-98-appstream.yml deleted file mode 100644 index 1e595c49ba..0000000000 --- a/repos/rhel-98-appstream.yml +++ /dev/null @@ -1,17 +0,0 @@ -- 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-98-appstream - reposync: - enabled: true - type: external diff --git a/repos/rhel-98-baseos.yml b/repos/rhel-98-baseos.yml deleted file mode 100644 index e3ff23db82..0000000000 --- a/repos/rhel-98-baseos.yml +++ /dev/null @@ -1,15 +0,0 @@ -- 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-98-baseos - reposync: - enabled: true - type: external diff --git a/repos/rhel-98-early-kernel.yml b/repos/rhel-98-early-kernel.yml deleted file mode 100644 index 05349703fc..0000000000 --- a/repos/rhel-98-early-kernel.yml +++ /dev/null @@ -1,15 +0,0 @@ -- 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-98-early-kernel - reposync: - enabled: true - type: external diff --git a/repos/rhel-98-highavailability.yml b/repos/rhel-98-highavailability.yml deleted file mode 100644 index 0acfac56f2..0000000000 --- a/repos/rhel-98-highavailability.yml +++ /dev/null @@ -1,14 +0,0 @@ -- conf: - baseurl: - x86_64: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/HighAvailability/x86_64/os/ - aarch64: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/HighAvailability/aarch64/os/ - ppc64le: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/HighAvailability/ppc64le/os/ - s390x: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/HighAvailability/s390x/os/ - extra_options: - gpgcheck: '1' - content_set: - optional: true - name: rhel-98-highavailability - reposync: - enabled: true - type: external diff --git a/repos/rhel-98-nfv.yml b/repos/rhel-98-nfv.yml deleted file mode 100644 index de30cdb258..0000000000 --- a/repos/rhel-98-nfv.yml +++ /dev/null @@ -1,15 +0,0 @@ -- conf: - baseurl: - # We only have x86_64 repo for nfv - x86_64: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/NFV/x86_64/os/ - aarch64: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/NFV/x86_64/os/ - ppc64le: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/NFV/x86_64/os/ - s390x: https://download.devel.redhat.com/rhel-9/nightly/updates/RHEL-9/latest-RHEL-9.8/compose/NFV/x86_64/os/ - extra_options: - gpgcheck: '1' - content_set: - optional: true - name: rhel-98-nfv - reposync: - enabled: true - type: external