add centos9

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 6436ed1e1b2248eb60f18127d98152a25427a522..0acfd11875ac35290a00d569d79f87c86b2e15d8 100644 (file)
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -35,6 +35,7 @@
             - focal
             - centos7
             - centos8
+            - centos9
             - jessie
             - stretch
             - buster
@@ -65,7 +66,7 @@
                   regex: (mimic|nautilus|octopus|pacific|quincy)
                   label: '${BRANCH}'
                 - condition-kind: regex-match
-                  regex: (xenial|bionic|focal|centos7|centos8|buster|bullseye)
+                  regex: (xenial|bionic|focal|centos7|centos8|centos9|buster|bullseye)
                   label: '${DIST}'
           on-evaluation-failure: dont-run
           steps:

diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm
old mode 100644 (file)
new mode 100755 (executable)
index c63763e..c52bf29
--- a/ceph-dev-build/build/setup_rpm
+++ b/ceph-dev-build/build/setup_rpm
@@ -18,7 +18,7 @@ if test $(id -u) != 0 ; then
 fi
 export LC_ALL=C # the following is vulnerable to i18n
 
-$SUDO yum install -y redhat-lsb-core yum-utils
+$SUDO yum install -y yum-utils
 
 get_rpm_dist
 

diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml
index 2e81fb0d673e9174616ba447d1035e2c80556047..b2287c6ac8b6ef30279a8af02b340330a4c4a014 100644 (file)
--- a/ceph-dev-build/config/definitions/ceph-dev-build.yml
+++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml
@@ -27,7 +27,7 @@
     execution-strategy:
        combination-filter: |
          DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH &&
-         (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "bionic", "centos7", "centos8"].contains(DIST)))
+         (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "bionic", "centos7", "centos8", "centos9"].contains(DIST)))
     axes:
       - axis:
           type: label-expression
@@ -50,6 +50,7 @@
             - focal
             - centos7
             - centos8
+            - centos9
             - jessie
             - precise
             - centos6
@@ -150,4 +151,3 @@
               password: DOCKER_HUB_PASSWORD
       - build-name:
           name: "#${BUILD_NUMBER} ${BRANCH}, ${SHA1}, ${DISTROS}, ${FLAVOR}"
-

diff --git a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
index 97da408015a6d4498c79bc65f9991ac6fd48efd1..efd0c469d0806f7f3e396f66da96390938622fe5 100644 (file)
--- a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
+++ b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml
@@ -53,6 +53,7 @@
             - centos6
             - centos7
             - centos8
+            - centos9
             - leap15
             - windows
       - axis:

diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml
index bdb0f72309e11a4c8efc0318630a53bd1699500c..914d1836786c3c563fd028baec12627920364aeb 100644 (file)
--- a/ceph-dev-new/config/definitions/ceph-dev-new.yml
+++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml
@@ -25,7 +25,7 @@
 
       - string:
           name: DISTROS
-          description: "A list of distros to build for. Available options are: centos8, centos7, centos6, focal, bionic, xenial, trusty, precise, wheezy, jessie, and windows"
+          description: "A list of distros to build for. Available options are: centos9, centos8, centos7, centos6, focal, bionic, xenial, trusty, precise, wheezy, jessie, and windows"
           default: "focal bionic centos7 centos8 windows"
 
       - string:

diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml
index 464a5609b8ecc6300c6850c5e3c56c641a7d3c5e..a2fb944b3b043c1c99139f017712fde5515dee69 100644 (file)
--- a/ceph-dev/config/definitions/ceph-dev.yml
+++ b/ceph-dev/config/definitions/ceph-dev.yml
@@ -25,7 +25,7 @@
 
       - string:
           name: DISTROS
-          description: "A list of distros to build for. Available options are: centos7, centos6, focal, bionic, xenial, trusty, precise, wheezy, jessie, and windows"
+          description: "A list of distros to build for. Available options are: centos9, centos8, centos7, centos6, focal, bionic, xenial, trusty, precise, wheezy, jessie, and windows"
           default: "focal bionic centos7 centos8"
 
       - string:

diff --git a/ceph-release-rpm/build/build b/ceph-release-rpm/build/build
old mode 100644 (file)
new mode 100755 (executable)
index 6a9d117..8256680
--- a/ceph-release-rpm/build/build
+++ b/ceph-release-rpm/build/build
@@ -33,6 +33,10 @@ if [ "$target" = "centos8" ] ; then
     target=el8
     chacra_baseurl="ceph-release/${chacra_ref}/HEAD/centos/8"
 fi
+if [ "$target"= "centos9" ] ; then
+    target=el9
+    chacra_baseurl="ceph-release/${chacra_ref}/HEAD/centos/9"
+fi
 if [ "$target" = "sles11sp2" ] ; then
     target=sles11
     chacra_baseurl="ceph-release/${chacra_ref}/HEAD/sles/11"

diff --git a/ceph/config/definitions/ceph.yml b/ceph/config/definitions/ceph.yml
index 9dfd5558cae7bc30a47acba4ab2df0e5f2523514..7a6055366696a8ae423dd2ae8433a8e222c69126 100644 (file)
--- a/ceph/config/definitions/ceph.yml
+++ b/ceph/config/definitions/ceph.yml
@@ -78,7 +78,7 @@ SECURITY: Builds from BRANCH-release branch in ceph-private.git (private repo)."
 
       - string:
           name: DISTROS
-          description: "A list of distros to build for. Available options are: centos8, centos7, centos6, focal, bionic, xenial, trusty, precise, wheezy, jessie, buster, bullseye"
+          description: "A list of distros to build for. Available options are: centos9, centos8, centos7, centos6, focal, bionic, xenial, trusty, precise, wheezy, jessie, buster, bullseye"
           default: "focal bionic centos8 buster bullseye"
 
       - string:

diff --git a/kernel/config/definitions/kernel.yml b/kernel/config/definitions/kernel.yml
index a38acc23a4440f2602485a06e85e16002f0a3869..0a648665a691347c6c4692f27b154e20f0f3e32d 100644 (file)
--- a/kernel/config/definitions/kernel.yml
+++ b/kernel/config/definitions/kernel.yml
@@ -16,7 +16,7 @@
 
       - string:
           name: DISTROS
-          description: "A list of distros to build for. Available options are: centos8, focal, bionic, xenial, and trusty"
+          description: "A list of distros to build for. Available options are: centos9, centos8, focal, bionic, xenial, and trusty"
           default: "centos8 trusty xenial bionic focal"
 
       - string:
@@ -59,6 +59,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
           type: label-expression
           name: AVAILABLE_DIST
           values:
+            - centos9
             - centos8
             - trusty
             - xenial

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
old mode 100644 (file)
new mode 100755 (executable)
index fd93666..be81334
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -256,40 +256,27 @@ get_rpm_dist() {
     # creates a DISTRO_VERSION and DISTRO global variable for
     # use in constructing chacra urls for rpm distros
 
-    LSB_RELEASE=/usr/bin/lsb_release
-    [ ! -x $LSB_RELEASE ] && echo unknown && exit
+    source /etc/os-release
 
-    ID=`$LSB_RELEASE --short --id`
+    RELEASE=$VERSION_ID
+    DISTRO=$ID
 
     case $ID in
-    RedHatEnterpriseServer)
-        RELEASE=`$LSB_RELEASE --short --release | cut -d. -f1`
+    rhel)
         DIST=rhel$RELEASE
-        DISTRO=rhel
         ;;
-    CentOS|CentOSStream)
-        RELEASE=`$LSB_RELEASE --short --release | cut -d. -f1`
+    centos)
         DIST=el$RELEASE
-        DISTRO=centos
         ;;
-    Fedora)
-        RELEASE=`$LSB_RELEASE --short --release`
+    fedora)
         DIST=fc$RELEASE
-        DISTRO=fedora
         ;;
-    SUSE\ LINUX|openSUSE)
-        DESC=`$LSB_RELEASE --short --description`
-        RELEASE=`$LSB_RELEASE --short --release`
-        case $DESC in
-        *openSUSE*)
-                DIST=opensuse$RELEASE
-                DISTRO=opensuse
-            ;;
-        *Enterprise*)
-                DIST=sles$RELEASE
-                DISTRO=sles
-                ;;
-            esac
+    sles)
+        DIST=sles$RELEASE
+        ;;
+    opensuse)
+        DIST=opensuse$RELEASE
+        DISTRO=opensuse
         ;;
     *)
         DIST=unknown
@@ -1356,6 +1343,13 @@ setup_rpm_build_deps() {
         $SUDO dnf config-manager --add-repo http://apt-mirror.front.sepia.ceph.com/lab-extras/8/
         $SUDO dnf config-manager --setopt=apt-mirror.front.sepia.ceph.com_lab-extras_8_.gpgcheck=0 --save
 
+    elif [ "$RELEASE" = 9 ]; then
+        $SUDO dnf -y copr enable ceph/el9
+        $SUDO dnf -y install epel-next-release
+
+        $SUDO dnf config-manager --add-repo http://mirror.stream.centos.org/9-stream/CRB/x86_64/os/
+
+        $SUDO dnf -y install javapackages-tools
     fi
 
     DIR=/tmp/install-deps.$$