From: Dan Mick Date: Mon, 8 Apr 2024 20:18:09 +0000 (-0700) Subject: ceph-dev-build,ceph-dev-new-build: build c9 containers X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2222%2Fhead;p=ceph-build.git ceph-dev-build,ceph-dev-new-build: build c9 containers Signed-off-by: Dan Mick --- diff --git a/ceph-dev-build/build/build_rpm b/ceph-dev-build/build/build_rpm index b32efadc..3ff4f4e6 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" && $RELEASE == "8" ]] ; then +if [[ "$CI_CONTAINER" == true && $DISTRO == "centos" && "$RELEASE" =~ 8|9 ]] ; 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 a84bbfab..5333efb3 100644 --- a/ceph-dev-new-build/build/build_rpm +++ b/ceph-dev-new-build/build/build_rpm @@ -87,7 +87,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" && $RELEASE == "8" ]] ; then +if [[ $CI_CONTAINER == "true" && $DISTRO == "centos" && "$RELEASE" =~ 8|9 ]] ; then loop=0 ready=false while ((loop < 15)); do