containers: another workaround for ceph container changes

Add another workaround for changes to the ceph container such that the ceph.repo file is deleted from /etc/yum.repos.d. Now we look for a new env var CEPH_IS_DEVEL (which I hope is not going to get changed any time soon) and uses that to decide if we should reinstall the release rpm from the ci system or from the official releases download site. Signed-off-by: John Mulligan <[email protected]>
ceph · Feb 9, 2025 · 2c5da9f · 2c5da9f
1 parent 2e15e72
commit 2c5da9f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/testing/containers/ceph/Dockerfile b/testing/containers/ceph/Dockerfile
@@ -13,7 +13,8 @@ RUN true \
     && echo "Check: [ ${CEPH_VERSION} = ${GO_CEPH_VERSION} ]" \
     && [ "${CEPH_VERSION}" = "${GO_CEPH_VERSION}" ] \
     && (. /etc/os-release ; if [ "$ID" = centos -a "$VERSION" = 8 ]; then find /etc/yum.repos.d/ -name '*.repo' -exec sed -i -e 's|^mirrorlist=|#mirrorlist=|g' -e 's|^#baseurl=http://mirror.centos.org|baseurl=https://vault.centos.org|g'  {} \; ; fi ) \
-    && if [ ! -f /etc/yum.repos.d/ceph.repo ]; then yum reinstall -y "$(curl -fs "https://shaman.ceph.com/api/search/?project=ceph&distros=centos/9/x86_64&flavor=default&ref=${CEPH_REF}&sha1=${CEPH_SHA:-latest}" | jq -r .[0].url)/noarch/ceph-release-1-0.el9.noarch.rpm"; fi \
+    && if [ ! -f /etc/yum.repos.d/ceph.repo -a "$CEPH_IS_DEVEL" = true ]; then yum reinstall -y "$(curl -fs "https://shaman.ceph.com/api/search/?project=ceph&distros=centos/9/x86_64&flavor=default&ref=${CEPH_REF}&sha1=${CEPH_SHA:-latest}" | jq -r .[0].url)/noarch/ceph-release-1-0.el9.noarch.rpm"; fi \
+    && if [ ! -f /etc/yum.repos.d/ceph.repo -a "$CEPH_IS_DEVEL" != true ]; then yum reinstall -y "https://download.ceph.com/rpm-${CEPH_REF}/el9/noarch/ceph-release-1-1.el9.noarch.rpm"; fi \
     && yum install -y \
         git wget /usr/bin/curl make \
         /usr/bin/cc /usr/bin/c++ gdb \