Add Trixie

Signed-off-by: David Galloway <david.galloway@ibm.com>

diff --git a/ceph-dev-pipeline/build/Jenkinsfile b/ceph-dev-pipeline/build/Jenkinsfile
index 588cde66808e36b43b1d68ab852d1d2a77ec6bdd..93c44e68368e1a7fc3b2ca51fd39a24fec0c8710 100644 (file)
--- a/ceph-dev-pipeline/build/Jenkinsfile
+++ b/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",
 ]

diff --git a/ceph-release-pipeline/config/definitions/ceph-release-pipeline.yml b/ceph-release-pipeline/config/definitions/ceph-release-pipeline.yml
index ac65e3acfaf714c6a664f7e3c45ef6d418253a44..f9044c188486783a5cc8986bb91b6c8ead5e76b7 100644 (file)
--- a/ceph-release-pipeline/config/definitions/ceph-release-pipeline.yml
+++ b/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

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index eed84e97d5b05d0efaecb58881c626b8ef5fb336..12e0754d25ecb91f62a992fdbc9c0f30f7fdea59 100755 (executable)
--- a/scripts/build_utils.sh
+++ b/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"

diff --git a/scripts/sync-pull b/scripts/sync-pull
index b928f086dd19d88727684a32c25c6108f4035b12..c805cea4c5e7c81721b240d57c966251bdfe67a7 100755 (executable)
--- a/scripts/sync-pull
+++ b/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"