From a803d372ade421a583be2f5c39f0500ab7a0d1e1 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 17 Jun 2026 08:53:12 -0400 Subject: [PATCH] Containerfile: Support pulp repo URLs Signed-off-by: David Galloway --- container/Containerfile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/container/Containerfile b/container/Containerfile index d277de30dad..9cc72d164b9 100644 --- a/container/Containerfile +++ b/container/Containerfile @@ -124,7 +124,16 @@ RUN --mount=type=secret,id=prerelease_creds set -ex && \ source /run/secrets/prerelease_creds; \ REPO_URL="https://${PRERELEASE_USERNAME}:${PRERELEASE_PASSWORD}@download.ceph.com/prerelease/ceph/rpm-${CEPH_REF}/${EL_VER}/" ;\ fi && \ - rpm -Uvh "$REPO_URL/noarch/ceph-release-1-${IS_RELEASE}.${EL_VER}.noarch.rpm" ; \ + # Trim trailing slashes + REPO_URL="${REPO_URL%/}" && \ + if [[ "$REPO_URL" == */pulp/content/* ]] ; then \ + # Pulp nests packages under noarch/Packages// + CEPH_RELEASE_RPM="$REPO_URL/noarch/Packages/c/ceph-release-1-${IS_RELEASE}.${EL_VER}.noarch.rpm" ; \ + else \ + # chacra serves packages flat under noarch/ + CEPH_RELEASE_RPM="$REPO_URL/noarch/ceph-release-1-${IS_RELEASE}.${EL_VER}.noarch.rpm" ; \ + fi && \ + rpm -Uvh "$CEPH_RELEASE_RPM" ; \ if [[ "$IS_RELEASE" == 1 ]] ; then \ sed -i "s;http://download.ceph.com/;https://${PRERELEASE_USERNAME}:${PRERELEASE_PASSWORD}@download.ceph.com/prerelease/ceph/;" /etc/yum.repos.d/ceph.repo ; \ dnf clean expire-cache ; \ -- 2.47.3