Add Ubuntu 22.04 (main only for now)

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

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 0acfd11875ac35290a00d569d79f87c86b2e15d8..b26aa46bf5b145a6aef3c0222312a7d8a47bad88 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" && ["xenial", "bionic", "focal", "centos7", "centos8"].contains(DIST)))
+         (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "bionic", "focal", "jammy", "centos7", "centos8"].contains(DIST)))
     axes:
       - axis:
           type: label-expression
@@ -33,6 +33,7 @@
             - xenial
             - bionic
             - focal
+            - jammy
             - centos7
             - centos8
             - centos9
@@ -66,7 +67,7 @@
                   regex: (mimic|nautilus|octopus|pacific|quincy)
                   label: '${BRANCH}'
                 - condition-kind: regex-match
-                  regex: (xenial|bionic|focal|centos7|centos8|centos9|buster|bullseye)
+                  regex: (xenial|bionic|focal|jammy|centos7|centos8|centos9|buster|bullseye)
                   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 07bd287e02229f1b99956598e79b54806f45d099..31ee393c4a27dd380e5d4522720f28b795865b25 100644 (file)
--- a/ceph-dev-build/config/definitions/ceph-dev-build.yml
+++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml
@@ -48,6 +48,7 @@
             - xenial
             - bionic
             - focal
+            - jammy
             - 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 41e5baa5ca75f62880f6ea90d3acd32a76fbd70f..b3db9d4bf0305c4a34f2ee59ca5f9bc0adf837f3 100644 (file)
--- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
+++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
@@ -109,7 +109,7 @@
                     FLAVOR=crimson
                     ARCHS=x86_64
       # build main on:
-      # default: focal centos8 windows
+      # default: jammy focal centos8 windows
       # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
@@ -126,7 +126,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal centos8 windows
+                    DISTROS=jammy focal centos8 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 efd0c469d0806f7f3e396f66da96390938622fe5..123661676400635df3c9bcfee518f6b47c065d58 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
@@ -48,6 +48,7 @@
             - xenial
             - bionic
             - focal
+            - jammy
             - 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 7bef59ecd10563453827bdba59ea6596091b753f..78965ca4330ad30d3b6550bf4d7edfbfce13b4ad 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
@@ -169,7 +169,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal centos8 windows
+                    DISTROS=jammy focal centos8 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 914d1836786c3c563fd028baec12627920364aeb..1e71b37fbfc5e485a96802c56d1aef0ac2b01e2d 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, focal, bionic, xenial, trusty, precise, wheezy, jessie, and windows"
-          default: "focal bionic centos7 centos8 windows"
+          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 windows"
 
       - string:
           name: ARCHS

diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
index 78077e83ce638069b4edcfe4a82ce20ebbe7b3f6..03f5fad10aee4ea2eea8b84285815bc9c45ca044 100644 (file)
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -127,7 +127,7 @@
                     DISTROS=centos8
                     FLAVOR=crimson
       # build main on:
-      # default: focal centos8
+      # default: jammy focal centos8
       # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
@@ -144,7 +144,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal centos8
+                    DISTROS=jammy focal centos8
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}

diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml
index 42415009770894d4c1c95a61b5db6348f774a25d..f1ad6c11465d25e8a7331b34ae867351b18170d4 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, focal, bionic, xenial, trusty, precise, wheezy, jessie, and windows"
-          default: "focal bionic centos7 centos8"
+          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"
 
       - string:
           name: ARCHS

diff --git a/ceph/config/definitions/ceph.yml b/ceph/config/definitions/ceph.yml
index 98e211ab9b0d48157b66098ea6014362c3067b53..1df311ecada18a9bf1b4c3ad8be46a38ba404f5a 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, focal, bionic, xenial, trusty, precise, wheezy, jessie, buster, bullseye"
-          default: "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"
+          default: "jammy focal bionic centos8 buster bullseye"
 
       - string:
           name: ARCHS

diff --git a/kernel/config/definitions/kernel.yml b/kernel/config/definitions/kernel.yml
index 0a648665a691347c6c4692f27b154e20f0f3e32d..427ab11107b7d7dcc595c8ae85e83fb213b301f2 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, centos8, focal, bionic, xenial, and trusty"
-          default: "centos8 trusty xenial bionic focal"
+          description: "A list of distros to build for. Available options are: centos9, centos8, jammy, focal, bionic, xenial, and trusty"
+          default: "centos8 trusty xenial bionic focal jammy"
 
       - string:
           name: ARCHS
@@ -65,6 +65,7 @@ If this is checked, then the binaries will be built and pushed to chacra even if
             - xenial
             - bionic
             - focal
+            - jammy
       - axis:
           type: dynamic
           name: DIST

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index e9c07d509c8f6d81951385f3ea1ca3da423b1d08..a3d77c6a8aa4061170acd946c0f59949599440f8 100755 (executable)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -417,6 +417,10 @@ get_distro_and_target() {
             DIST=wheezy
             DISTRO="debian"
             ;;
+        jammy*)
+            DIST=jammy
+            DISTRO="ubuntu"
+            ;;
         focal*)
             DIST=focal
             DISTRO="ubuntu"
@@ -527,6 +531,7 @@ setup_pbuilder() {
     [ "$DIST" = "xenial" ] && os="ubuntu"
     [ "$DIST" = "bionic" ] && os="ubuntu"
     [ "$DIST" = "focal" ] && os="ubuntu"
+    [ "$DIST" = "jammy" ] && os="ubuntu"
 
     if [ $os = "debian" ]; then
         mirror="http://www.gtlib.gatech.edu/pub/debian"
@@ -763,6 +768,8 @@ setup_pbuilder_for_old_gcc() {
             old=8;;
         focal)
             old=9;;
+        jammy)
+            old=11;;
     esac
     setup_gcc_hook $old > $hookdir/D10update-gcc-alternatives
     chmod +x $hookdir/D10update-gcc-alternatives
@@ -792,6 +799,7 @@ get_bptag() {
     [ "$dist" = "wheezy" ] && dver="~bpo70+1"
     [ "$dist" = "squeeze" ] && dver="~bpo60+1"
     [ "$dist" = "lenny" ] && dver="~bpo50+1"
+    [ "$dist" = "jammy" ] && dver="$dist"
     [ "$dist" = "focal" ] && dver="$dist"
     [ "$dist" = "bionic" ] && dver="$dist"
     [ "$dist" = "xenial" ] && dver="$dist"