From: David Galloway <dgallowa@redhat.com>
Date: Wed, 8 Sep 2021 17:32:59 +0000 (-0400)
Subject: ceph: Build for bullseye
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5410aee8bc28e040891c382aab0cc73800e5a0bb;p=ceph-build.git

ceph: Build for bullseye

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

diff --git a/ceph-build/build/setup_deb b/ceph-build/build/setup_deb
index 41788229..29ae8f32 100644
--- a/ceph-build/build/setup_deb
+++ b/ceph-build/build/setup_deb
@@ -35,7 +35,7 @@ vers=`cat ./dist/version`
 # like project/ref/ubuntu/jessie/.
 distro=""
 case $DIST in
-    buster|stretch|jessie|wheezy)
+    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 81f685d1..fa7f4071 100644
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -38,6 +38,7 @@
             - jessie
             - stretch
             - buster
+            - bullseye
             - precise
             - centos6
       - axis:
diff --git a/ceph/config/definitions/ceph.yml b/ceph/config/definitions/ceph.yml
index 1d4beb00..6128f4f8 100644
--- a/ceph/config/definitions/ceph.yml
+++ b/ceph/config/definitions/ceph.yml
@@ -72,8 +72,8 @@ Defaults to un-checked"
 
       - string:
           name: DISTROS
-          description: "A list of distros to build for. Available options are: centos8, centos7, centos6, focal, bionic, xenial, trusty, precise, wheezy, and jessie"
-          default: "focal bionic centos7 centos8 buster"
+          description: "A list of distros to build for. Available options are: centos8, centos7, centos6, focal, bionic, xenial, trusty, precise, wheezy, jessie, buster, bullseye"
+          default: "focal bionic centos8 buster bullseye"
 
       - string:
           name: ARCHS
diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index c09519db..f2c3dd9f 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -404,6 +404,10 @@ get_distro_and_target() {
     # Get distro from DIST for chacra uploads
     DISTRO=""
     case $DIST in
+        bullseye*)
+            DIST=bullseye
+            DISTRO="debian"
+            ;;
         buster*)
             DIST=buster
             DISTRO="debian"
@@ -786,6 +790,7 @@ get_bptag() {
     dist=$1
 
     [ "$dist" = "sid" ] && dver=""
+    [ "$dist" = "bullseye" ] && dver="~bpo11+1"
     [ "$dist" = "buster" ] && dver="~bpo10+1"
     [ "$dist" = "stretch" ] && dver="~bpo90+1"
     [ "$dist" = "jessie" ] && dver="~bpo80+1"
diff --git a/scripts/sync-pull b/scripts/sync-pull
index 041e929d..c2d436f7 100644
--- 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/jessie debian/stretch debian/buster ubuntu/trusty ubuntu/xenial ubuntu/bionic; do
+for combo in debian/jessie debian/stretch debian/buster debian/bullseye ubuntu/trusty ubuntu/xenial ubuntu/bionic; 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