From 077012d6f25237e9ef21bf37b4741971874ef7ff Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Tue, 26 Nov 2024 13:52:13 -0500 Subject: [PATCH 1/2] ubi9: remove references to rhceph aarch64 CDN repo The rhceph-8-tools-for-rhel-9-aarch64-rpms repository does not exist on cdn.redhat.com. ODCS will not use RPMs from that Pulp repo. Signed-off-by: Ken Dreyer --- ceph-releases/squid/ubi9-ibm/daemon-base/content_sets.yml | 5 ----- ceph-releases/squid/ubi9-redhat/daemon-base/content_sets.yml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/ceph-releases/squid/ubi9-ibm/daemon-base/content_sets.yml b/ceph-releases/squid/ubi9-ibm/daemon-base/content_sets.yml index 127376c36..6237b275e 100644 --- a/ceph-releases/squid/ubi9-ibm/daemon-base/content_sets.yml +++ b/ceph-releases/squid/ubi9-ibm/daemon-base/content_sets.yml @@ -23,8 +23,3 @@ s390x: - rhel-9-for-s390x-appstream-rpms - rhceph-8-tools-for-rhel-9-s390x-rpms - codeready-builder-for-rhel-9-s390x-rpms -aarch64: - - rhel-9-for-aarch64-baseos-rpms - - rhel-9-for-aarch64-appstream-rpms - - rhceph-8-tools-for-rhel-9-aarch64-rpms - - codeready-builder-for-rhel-9-aarch64-rpms diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/content_sets.yml b/ceph-releases/squid/ubi9-redhat/daemon-base/content_sets.yml index 127376c36..6237b275e 100644 --- a/ceph-releases/squid/ubi9-redhat/daemon-base/content_sets.yml +++ b/ceph-releases/squid/ubi9-redhat/daemon-base/content_sets.yml @@ -23,8 +23,3 @@ s390x: - rhel-9-for-s390x-appstream-rpms - rhceph-8-tools-for-rhel-9-s390x-rpms - codeready-builder-for-rhel-9-s390x-rpms -aarch64: - - rhel-9-for-aarch64-baseos-rpms - - rhel-9-for-aarch64-appstream-rpms - - rhceph-8-tools-for-rhel-9-aarch64-rpms - - codeready-builder-for-rhel-9-aarch64-rpms From 267962af5db3186ae5db1732fbae481718a17f92 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Tue, 26 Nov 2024 13:53:49 -0500 Subject: [PATCH 2/2] ubi9-redhat: disable aarch64 for OSBS build We will build the aarch64-enabled container at IBM, not Red Hat. Signed-off-by: Ken Dreyer --- ceph-releases/squid/ubi9-redhat/daemon-base/container.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ceph-releases/squid/ubi9-redhat/daemon-base/container.yaml b/ceph-releases/squid/ubi9-redhat/daemon-base/container.yaml index 5c7a547df..592cf1bd6 100644 --- a/ceph-releases/squid/ubi9-redhat/daemon-base/container.yaml +++ b/ceph-releases/squid/ubi9-redhat/daemon-base/container.yaml @@ -1,6 +1,9 @@ # https://osbs.readthedocs.io/en/latest/users.html#compose --- +platforms: + not: aarch64 + compose: packages: [] pulp_repos: true