ceph-build, etc: add debian bookworm

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb
index 3a9a97d3f21da9edadf368fa3bc410627ee45c7b..8af8b2a9f0a638b21fd81428994157743085f429 100644 (file)
--- a/ceph-build/build/setup_deb
+++ b/ceph-build/build/setup_deb
@@ -38,7 +38,7 @@ vers=`cat ./dist/version`
 # like project/ref/ubuntu/jessie/.
 distro=""
 case $DIST in
-    bullseye|buster|stretch|jessie|wheezy)
+    bookworm|bullseye|buster|stretch|jessie|wheezy)
         distro="debian"
         ;;
     *)

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index cdb05cc8266569ce5de53187db38039ebbe59163..28919fcf39daaccbd7a5fe04821c76f11d7585d4 100644 (file)
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -41,6 +41,7 @@
             - stretch
             - buster
             - bullseye
+            - bookworm
             - precise
             - centos6
       - axis:
@@ -67,7 +68,7 @@
                   regex: (mimic|nautilus|octopus|pacific|quincy|reef)
                   label: '${BRANCH}'
                 - condition-kind: regex-match
-                  regex: (xenial|bionic|focal|jammy|centos7|centos8|centos9|buster|bullseye)
+                  regex: (xenial|bionic|focal|jammy|centos7|centos8|centos9|buster|bullseye|bookworm)
                   label: '${DIST}'
           on-evaluation-failure: dont-run
           steps:

diff --git a/ceph/config/definitions/ceph.yml b/ceph/config/definitions/ceph.yml
index 1df311ecada18a9bf1b4c3ad8be46a38ba404f5a..6aaa496dcc43462fb77fb8a58e1e18c822beb8e2 100644 (file)
--- a/ceph/config/definitions/ceph.yml
+++ b/ceph/config/definitions/ceph.yml
@@ -78,8 +78,8 @@ 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: centos9, centos8, centos7, centos6, jammy, focal, bionic, xenial, trusty, precise, wheezy, jessie, buster, bullseye"
-          default: "jammy focal bionic centos8 buster bullseye"
+          description: "A list of distros to build for. Available options are: centos9, centos8, centos7, centos6, jammy, focal, bionic, xenial, trusty, precise, wheezy, jessie, buster, bullseye, bookworm"
+          default: "jammy focal centos8 centos9 bookworm"
 
       - string:
           name: ARCHS

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 73a08f7db5f39e7db96003a4773d07391ac19c87..19df268b5adc93fd2cf62263ac710855bd57aec8 100755 (executable)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -411,6 +411,10 @@ get_distro_and_target() {
     # Get distro from DIST for chacra uploads
     DISTRO=""
     case $DIST in
+        bookworm*)
+            DIST=bookworm
+            DISTRO="debian"
+            ;;
         bullseye*)
             DIST=bullseye
             DISTRO="debian"
@@ -811,6 +815,7 @@ get_bptag() {
     dist=$1
 
     [ "$dist" = "sid" ] && dver=""
+    [ "$dist" = "bookworm" ] && dver="~bpo12+1"
     [ "$dist" = "bullseye" ] && dver="~bpo11+1"
     [ "$dist" = "buster" ] && dver="~bpo10+1"
     [ "$dist" = "stretch" ] && dver="~bpo90+1"

diff --git a/scripts/sync-pull b/scripts/sync-pull
index 23edceab352b445fb99d0b1d9f378a3f16a5f435..f949d9ec05322461dd45796fc892c47cde99b918 100755 (executable)
--- a/scripts/sync-pull
+++ b/scripts/sync-pull
@@ -14,7 +14,7 @@ echo "********************************************"
 
 # This ugly loop check all possible DEB combinations to see which repo has the most packages since that's likely the repo you want to sync.
 current_highest_count=0
-for combo in debian/bullseye ubuntu/bionic ubuntu/focal ubuntu/jammy; do
+for combo in debian/bookworm debian/bullseye ubuntu/bionic ubuntu/focal ubuntu/jammy; do
   combo_count=$(curl -s https://chacra.ceph.com/r/$project/$release/$sha1/${combo}/flavors/default/pool/main/c/ceph/ | wc -l)
   if [ $combo_count -gt $current_highest_count ]; then
     current_highest_count=$combo_count