Support for Ubuntu Noble

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

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 8f8472929278dda960016b7161d78db5465ba6a5..e3d594c71cc5a7822e97d361a5f58bc232905e04 100644 (file)
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -12,7 +12,7 @@
     execution-strategy:
        combination-filter: |
          DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH &&
-         (ARCH == "x86_64" || (ARCH == "arm64" && ["bionic", "focal", "jammy", "centos9"].contains(DIST)))
+         (ARCH == "x86_64" || (ARCH == "arm64" && ["bionic", "focal", "jammy", "noble", "centos9"].contains(DIST)))
     axes:
       - axis:
           type: label-expression
@@ -34,6 +34,7 @@
             - bionic
             - focal
             - jammy
+            - noble
             - centos7
             - centos8
             - centos9
@@ -65,7 +66,7 @@
                   regex: (reef|squid|tentacle)
                   label: '${{BRANCH}}'
                 - condition-kind: regex-match
-                  regex: (focal|jammy|centos9|buster|bullseye|bookworm)
+                  regex: (focal|jammy|noble|centos9|buster|bullseye|bookworm)
                   label: '${{DIST}}'
           on-evaluation-failure: dont-run
           steps:

diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml
index 8165f47d7381f70c436d99e60dad5793df669da3..02251ce9934bfad4b24bea66fe99c96aa345b675 100644 (file)
--- a/ceph-dev-build/config/definitions/ceph-dev-build.yml
+++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml
@@ -39,6 +39,7 @@
             - bionic
             - focal
             - jammy
+            - noble
             - centos7
             - centos8
             - centos9

diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
index 575aa1fbc743d281fe98d173f013147f87b894e0..51fd9df69594290ddc7ec7d80597675b4a27d8d8 100644 (file)
--- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
+++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
@@ -57,7 +57,7 @@
                     FORCE=True
                     DISTROS=jammy focal centos9 windows
       # build squid on:
-      # default: jammy centos9 windows
+      # default: noble jammy centos9 windows
       - conditional-step:
           condition-kind: regex-match
           regex: .*squid.*
@@ -73,9 +73,9 @@
                   predefined-parameters: |
                     BRANCH=${{GIT_BRANCH}}
                     FORCE=True
-                    DISTROS=jammy centos9 windows
+                    DISTROS=noble jammy centos9 windows
       # build tentacle on:
-      # default: jammy centos9 windows
+      # default: noble jammy centos9 windows
       # crimson: centos9
       - conditional-step:
           condition-kind: regex-match
@@ -92,7 +92,7 @@
                   predefined-parameters: |
                     BRANCH=${{GIT_BRANCH}}
                     FORCE=True
-                    DISTROS=jammy centos9 windows
+                    DISTROS=noble jammy centos9 windows
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${{GIT_BRANCH}}
@@ -101,7 +101,7 @@
                     FLAVOR=crimson-debug
                     ARCHS=x86_64
       # build main on:
-      # default: jammy centos9 windows
+      # default: noble jammy centos9 windows
       # crimson-debug: centos9
       # crimson-release: centos9
       - conditional-step:
@@ -119,7 +119,7 @@
                   predefined-parameters: |
                     BRANCH=${{GIT_BRANCH}}
                     FORCE=True
-                    DISTROS=jammy centos9 windows
+                    DISTROS=noble jammy centos9 windows
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${{GIT_BRANCH}}

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 c45fdd86a52d7b0eafe16457cc45b42fb48fdebc..a721d8004bd5efcd1751e161299982d92ba0befd 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
@@ -44,6 +44,7 @@
             - bionic
             - focal
             - jammy
+            - noble
             - jessie
             - precise
             - centos6

diff --git a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
index a96ea1953aadef3df9de3a6927a621b13a44e0b1..11fa8db6cfd54bb64bcaeac4b3aeade2601ed643 100644 (file)
--- a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
+++ b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
@@ -50,7 +50,7 @@
                 - project: 'ceph-dev-new'
 
       # build squid on:
-      # default: jammy centos9 windows
+      # default: noble jammy centos9 windows
       - conditional-step:
           condition-kind: regex-match
           regex: .*squid.*
@@ -66,9 +66,9 @@
                   predefined-parameters: |
                     BRANCH=${{GIT_BRANCH}}
                     FORCE=True
-                    DISTROS=jammy centos9 windows
+                    DISTROS=noble jammy centos9 windows
       # build tentacle on:
-      # default: jammy centos9 windows
+      # default: noble jammy centos9 windows
       # crimson: centos9
       - conditional-step:
           condition-kind: regex-match
@@ -85,7 +85,7 @@
                   predefined-parameters: |
                     BRANCH=${{GIT_BRANCH}}
                     FORCE=True
-                    DISTROS=jammy centos9 windows
+                    DISTROS=noble jammy centos9 windows
                 - project: 'ceph-dev-new'
                   predefined-parameters: |
                     BRANCH=${{GIT_BRANCH}}
@@ -110,7 +110,7 @@
                   predefined-parameters: |
                     BRANCH=${{GIT_BRANCH}}
                     FORCE=True
-                    DISTROS=jammy centos9 windows
+                    DISTROS=noble jammy centos9 windows
             - trigger-builds:
                 - project: 'ceph-dev-new'
                   predefined-parameters: |

diff --git a/ceph-dev-new/config/definitions/ceph-dev-new.yml b/ceph-dev-new/config/definitions/ceph-dev-new.yml
index f90589c36e700b03f93a548ffecbc87d0006119a..bb7e375c06b3f79e47d27816fc1a4bc743062df5 100644 (file)
--- a/ceph-dev-new/config/definitions/ceph-dev-new.yml
+++ b/ceph-dev-new/config/definitions/ceph-dev-new.yml
@@ -25,8 +25,8 @@
 
       - 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, and windows"
-          default: "jammy centos9 windows"
+          description: "A list of distros to build for. Available options are: centos9, centos8, centos7, centos6, noble, jammy, focal, bionic, xenial, trusty, precise, wheezy, jessie, and windows"
+          default: "noble jammy centos9 windows"
 
       - string:
           name: ARCHS

diff --git a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
index bb5e93d1ad0fafa0bb66bf748784631ab6d13277..58763e6713dcd6229a4bd0a57b9a074777272f31 100644 (file)
--- a/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
+++ b/ceph-dev-pipeline/config/definitions/ceph-dev-pipeline.yml
@@ -33,7 +33,7 @@
       - string:
           name: DISTROS
           description: "A list of distros to build for. Available options are: centos9, centos8, noble, jammy, focal, and windows"
-          default: "centos9 jammy"
+          default: "centos9 noble jammy"
 
       - string:
           name: ARCHS

diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml
index d71498ddbebdea6870c98251d2f612a5183382f1..4801a620866462050442ed8df8002803c64fbd70 100644 (file)
--- a/ceph-dev/config/definitions/ceph-dev.yml
+++ b/ceph-dev/config/definitions/ceph-dev.yml
@@ -23,8 +23,8 @@
 
       - 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, and windows"
-          default: "jammy focal bionic centos7 centos8 centos9"
+          description: "A list of distros to build for. Available options are: centos9, centos8, centos7, centos6, noble, jammy, focal, bionic, xenial, trusty, precise, wheezy, jessie, and windows"
+          default: "noble jammy focal bionic centos7 centos8 centos9"
 
       - string:
           name: ARCHS

diff --git a/ceph/config/definitions/ceph.yml b/ceph/config/definitions/ceph.yml
index bc3022986c3bd1e03838bc25b3c3ce7ce2353b85..a28412bf3ee120d975ceaec090d90a62a0dd78d8 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, bookworm"
-          default: "jammy focal centos8 centos9 bookworm"
+          description: "A list of distros to build for. Available options are: centos9, centos8, centos7, centos6, noble, jammy, focal, bionic, xenial, trusty, precise, wheezy, jessie, buster, bullseye, bookworm"
+          default: "noble jammy focal centos8 centos9 bookworm"
 
       - string:
           name: ARCHS

diff --git a/kernel/config/definitions/kernel.yml b/kernel/config/definitions/kernel.yml
index f6303ae4b25a90f080bff00a4994a72f17e24e1e..926036b22ded05bacbe2554cc6c3389edda98d34 100644 (file)
--- a/kernel/config/definitions/kernel.yml
+++ b/kernel/config/definitions/kernel.yml
@@ -16,8 +16,8 @@
 
       - string:
           name: DISTROS
-          description: "A list of distros to build for. Available options are: centos9, jammy and focal"
-          default: "centos9 focal jammy"
+          description: "A list of distros to build for. Available options are: centos9, noble, jammy and focal"
+          default: "centos9 focal jammy noble"
 
       - string:
           name: ARCHS
@@ -62,6 +62,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
             - centos9
             - focal
             - jammy
+            - noble
       - axis:
           type: dynamic
           name: DIST

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index ec6c69fff7b90ec2c873edb6cdb28eeafafc114e..8aa7c3def892b2805ba01d961664f52b71e284db 100755 (executable)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -433,6 +433,10 @@ get_distro_and_target() {
             DIST=wheezy
             DISTRO="debian"
             ;;
+        noble*)
+            DIST=noble
+            DISTRO="ubuntu"
+            ;;
         jammy*)
             DIST=jammy
             DISTRO="ubuntu"
@@ -548,6 +552,7 @@ setup_pbuilder() {
     [ "$DIST" = "bionic" ] && os="ubuntu"
     [ "$DIST" = "focal" ] && os="ubuntu"
     [ "$DIST" = "jammy" ] && os="ubuntu"
+    [ "$DIST" = "noble" ] && os="ubuntu"
 
     if [ $os = "debian" ]; then
         # this mirror seems to have been decommissioned.
@@ -798,6 +803,8 @@ setup_pbuilder_for_old_gcc() {
             old=9;;
         jammy)
             old=11;;
+        noble)
+            old=13;;
     esac
     setup_gcc_hook $old > $hookdir/D10update-gcc-alternatives
     chmod +x $hookdir/D10update-gcc-alternatives
@@ -825,6 +832,7 @@ get_bptag() {
     [ "$dist" = "wheezy" ] && dver="~bpo70+1"
     [ "$dist" = "squeeze" ] && dver="~bpo60+1"
     [ "$dist" = "lenny" ] && dver="~bpo50+1"
+    [ "$dist" = "noble" ] && dver="$dist"
     [ "$dist" = "jammy" ] && dver="$dist"
     [ "$dist" = "focal" ] && dver="$dist"
     [ "$dist" = "bionic" ] && dver="$dist"

diff --git a/scripts/sync-pull b/scripts/sync-pull
index fa879dd373ccd6f4e9c52f20627f8f3c06036248..bc5d12690eadec43772d43d307cc7748ad57c59a 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; do
+  for combo in 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)
     if [ $combo_count -gt $current_highest_count ]; then
       current_highest_count=$combo_count