Merge pull request #2532 from ceph/trixie

Add Trixie

Author: dmick

ceph-dev-pipeline/build/Jenkinsfile

@@ -9,6 +9,7 @@ import groovy.transform.Field
   "focal": "20.04",
 ]
 @Field Map debian_releases = [
+  "trixie": "13",
   "bookworm": "12",
   "bullseye": "11",
 ]

ceph-release-pipeline/config/definitions/ceph-release-pipeline.yml

@@ -77,8 +77,8 @@
 
       - string:
           name: DISTROS
-          description: "A list of distros to build for. Available options are: centos9, noble, jammy, focal, bionic, xenial, trusty, precise, wheezy, jessie, buster, bullseye, bookworm"
-          default: "noble jammy centos8 centos9 bookworm"
+          description: "A list of distros to build for. Available options are: centos9, noble, jammy, focal, bionic, xenial, trusty, precise, wheezy, jessie, buster, bullseye, bookworm, trixie"
+          default: "noble jammy centos8 centos9 bookworm trixie"
 
       - string:
           name: ARCHS

scripts/build_utils.sh

@@ -405,6 +405,10 @@ get_distro_and_target() {
     # Get distro from DIST for chacra uploads
     DISTRO=""
     case $DIST in
+        trixie*)
+            DIST=trixie
+            DISTRO="debian"
+            ;;
         bookworm*)
             DIST=bookworm
             DISTRO="debian"
@@ -829,6 +833,7 @@ get_bptag() {
     dist=$1
 
     [ "$dist" = "sid" ] && dver=""
+    [ "$dist" = "trixie" ] && dver="~bpo13+1"
     [ "$dist" = "bookworm" ] && dver="~bpo12+1"
     [ "$dist" = "bullseye" ] && dver="~bpo11+1"
     [ "$dist" = "buster" ] && dver="~bpo10+1"

scripts/sync-pull

@@ -16,7 +16,7 @@ echo "********************************************"
 if [[ "$project" == "ceph" ]] ; then
   # This ugly loop checks 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/bookworm debian/bullseye ubuntu/bionic ubuntu/focal ubuntu/jammy ubuntu/noble; do
+  for combo in debian/trixie debian/bookworm debian/bullseye ubuntu/bionic ubuntu/focal ubuntu/jammy ubuntu/noble; do
     combo_count=$(curl -fs https://chacra.ceph.com/r/$project/$release/$sha1/${combo}/flavors/default/pool/main/c/ceph/ | wc -l || /bin/true)
     if [[ ${PIPESTATUS[0]} -eq 22 ]] ; then
       echo "$combo packages not found, skipping"