From: David Galloway <dgallowa@redhat.com>
Date: Wed, 10 Aug 2022 17:29:01 +0000 (-0400)
Subject: ceph*build: Do not build containers on CentOS9 for now
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2056%2Fhead;p=ceph-build.git

ceph*build: Do not build containers on CentOS9 for now

ceph-container isn't ready yet.  There is work being done in https://github.com/ceph/ceph-container/pull/2038 but our build scripts still need a lot of adjustments.

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm
index 269ee13e..b32efadc 100644
--- a/ceph-dev-build/build/build_rpm
+++ b/ceph-dev-build/build/build_rpm
@@ -84,7 +84,7 @@ fi
 
 # XXX perhaps use job parameters instead of literals; then
 # later stages can also use them to compare etc.
-if [[ "$CI_CONTAINER" == true && $DISTRO == "centos" ]] ; then
+if [[ "$CI_CONTAINER" == true && $DISTRO == "centos" && $RELEASE == "8" ]] ; then
     loop=0
     ready=false
     while ((loop < 15)); do
diff --git a/ceph-dev-new-build/build/build_rpm b/ceph-dev-new-build/build/build_rpm
index cd9febaf..091f2bdd 100644
--- a/ceph-dev-new-build/build/build_rpm
+++ b/ceph-dev-new-build/build/build_rpm
@@ -84,7 +84,7 @@ fi
 # XXX perhaps use job parameters instead of literals; then
 # later stages can also use them to compare etc.
 # build container image that supports building crimson-osd
-if [[ $CI_CONTAINER == "true" && $DISTRO == "centos" ]] ; then
+if [[ $CI_CONTAINER == "true" && $DISTRO == "centos" && $RELEASE == "8" ]] ; then
     loop=0
     ready=false
     while ((loop < 15)); do