Update releases - add reef, remove octopus and older

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
index 3d62f752f6d37d96ff858ec9d7570cdfadc85fe1..a2bf0f5734c7bfb96d217485c0db4ed78f549ce9 100644 (file)
--- a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
+++ b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
@@ -2,10 +2,9 @@
     name: ceph-api-nightly
     ceph_branch:
       - main
+      - reef
       - quincy
       - pacific
-      - octopus
-      - nautilus
     test_suite:
       - backend:
           test_suite_script: run-backend-api-tests.sh

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index b26aa46bf5b145a6aef3c0222312a7d8a47bad88..cdb05cc8266569ce5de53187db38039ebbe59163 100644 (file)
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -64,7 +64,7 @@
             - condition-kind: and
               condition-operands:
                 - condition-kind: regex-match
-                  regex: (mimic|nautilus|octopus|pacific|quincy)
+                  regex: (mimic|nautilus|octopus|pacific|quincy|reef)
                   label: '${BRANCH}'
                 - condition-kind: regex-match
                   regex: (xenial|bionic|focal|jammy|centos7|centos8|centos9|buster|bullseye)

diff --git a/ceph-dashboard-cephadm-e2e-nightly/config/definitions/ceph-dashboard-cephadm-e2e-nightly.yml b/ceph-dashboard-cephadm-e2e-nightly/config/definitions/ceph-dashboard-cephadm-e2e-nightly.yml
index 1ee266f5a6a46393289e2aaa7a6aa8f7ea1e6256..43d66b1b288c7968ee2b4d319dffcea9efaebf47 100644 (file)
--- a/ceph-dashboard-cephadm-e2e-nightly/config/definitions/ceph-dashboard-cephadm-e2e-nightly.yml
+++ b/ceph-dashboard-cephadm-e2e-nightly/config/definitions/ceph-dashboard-cephadm-e2e-nightly.yml
@@ -2,9 +2,9 @@
     name: ceph-dashboard-cephadm-e2e-nightly
     ceph_branch:
       - main
+      - reef
       - quincy
       - pacific
-      - octopus
     jobs:
       - '{name}-{ceph_branch}'
 

diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
index c70db47fb1dddc4d102e3b938f4c5d7c1e8b1aef..e0ed228293b58607732221504940cbbe72287331 100644 (file)
--- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
+++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
@@ -30,19 +30,20 @@
           browser: auto
           branches:
             - origin/main
+            - origin/reef
             - origin/quincy
             - origin/pacific
-            - origin/octopus
           skip-tag: true
           timeout: 20
           wipe-workspace: true
 
     builders:
-      # build octopus on:
-      # default: focal bionic centos7 centos8 leap15
+      # build pacific on:
+      # default: focal bionic centos8 leap15
+      # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
-          regex: .*octopus.*
+          regex: .*pacific.*
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps:
@@ -55,13 +56,20 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal bionic centos7 centos8 leap15
-      # build pacific on:
-      # default: focal bionic centos8 leap15
+                    DISTROS=focal bionic centos8 leap15
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos8
+                    FLAVOR=crimson
+                    ARCHS=x86_64
+      # build quincy on:
+      # default: focal centos8 centos9 leap15
       # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
-          regex: .*pacific.*
+          regex: .*quincy.*
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps:
@@ -74,7 +82,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal bionic centos8 leap15
+                    DISTROS=focal centos8 centos9 leap15
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
@@ -82,12 +90,12 @@
                     DISTROS=centos8
                     FLAVOR=crimson
                     ARCHS=x86_64
-      # build quincy on:
-      # default: focal centos8 centos9 leap15
+      # build reef on:
+      # default: jammy focal centos8 centos9 windows
       # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
-          regex: .*quincy.*
+          regex: .*reef.*
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps:
@@ -100,7 +108,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal centos8 centos9 leap15
+                    DISTROS=jammy focal centos8 centos9 windows
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}

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 41f0e2d6b9e5749ae6f652769c679bcc0fc51b31..9ae13a79980526b050ac28753896679c58980b0a 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
@@ -152,12 +152,38 @@
                     DISTROS=centos8
                     FLAVOR=crimson
                     ARCHS=x86_64
+      # build reef on:
+      # default: jammy focal centos8 centos9 windows
+      # crimson: centos8
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*reef.*
+          label: '${GIT_BRANCH}'
+          on-evaluation-failure: dont-run
+          steps:
+            - shell:
+                !include-raw:
+                - ../../../scripts/build_utils.sh
+                - ../../build/notify
+            - trigger-builds:
+                - project: 'ceph-dev-new'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=jammy focal centos8 centos9 windows
+                - project: 'ceph-dev-new'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos8
+                    FLAVOR=crimson
+                    ARCHS=x86_64
       # If no release name is found in branch, build on all possible distro/flavor combos (except xenial and bionic).
       # regex matching and 'on-evaluation-failure: run' doesn't work here so triple negative it is.
       - conditional-step:
           condition-kind: shell
           condition-command: |
-            echo "${GIT_BRANCH}" | grep -v '\(luminous\|mimic\|nautilus\|octopus\|pacific\|quincy\|centos9-only\|crimson-only\|jaeger\)'
+            echo "${GIT_BRANCH}" | grep -v '\(luminous\|mimic\|nautilus\|octopus\|pacific\|quincy\|reef\|centos9-only\|crimson-only\|jaeger\)'
           on-evaluation-failure: dont-run
           steps:
             - shell:

diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
index 8b643bdda59ca37f1bb4b8b8402e814352429cf2..270f5cf891ed7d5f4fc7a64254740043b131a8e3 100644 (file)
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -35,6 +35,7 @@
             - 'origin/octopus'
             - 'origin/pacific'
             - 'origin/quincy'
+            - 'origin/reef'
           skip-tag: true
           timeout: 20
           wipe-workspace: true
@@ -126,6 +127,31 @@
                     FORCE=True
                     DISTROS=centos8
                     FLAVOR=crimson
+      # build reef on:
+      # default: jammy focal centos8 centos9
+      # crimson: centos8
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*main.*
+          label: '${GIT_BRANCH}'
+          on-evaluation-failure: dont-run
+          steps:
+            - shell:
+                !include-raw:
+                - ../../../scripts/build_utils.sh
+                - ../../build/notify
+            - trigger-builds:
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=jammy focal centos8 centos9
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos8
+                    FLAVOR=crimson
       # build main on:
       # default: jammy focal centos8 centos9
       # crimson: centos8

diff --git a/ceph-doc-releases-rtd/config/definitions/ceph-doc-releases-rtd.yml b/ceph-doc-releases-rtd/config/definitions/ceph-doc-releases-rtd.yml
index be2350d232b8aa69016d6249c96155fdcc3b6939..7e6e2c2acfdaaaf05b9917ec46418dddec28e29d 100644 (file)
--- a/ceph-doc-releases-rtd/config/definitions/ceph-doc-releases-rtd.yml
+++ b/ceph-doc-releases-rtd/config/definitions/ceph-doc-releases-rtd.yml
@@ -35,7 +35,7 @@
             - 'doc/releases'
     builders:
       - shell: |
-          RELEASES="quincy pacific octopus"
+          RELEASES="reef quincy pacific octopus"
           for release in $RELEASES; do
             curl -X POST -H "Authorization: Token $READTHEDOCS_TOKEN" https://readthedocs.org/api/v3/projects/ceph/versions/$release/builds/
           done

diff --git a/ceph-pr-api/config/definitions/ceph-pr-api.yml b/ceph-pr-api/config/definitions/ceph-pr-api.yml
index a9cc204a3ad75392740d7f40a360507441e518fb..83881818859cbd554573eb60c7c8ef574c3e5885 100644 (file)
--- a/ceph-pr-api/config/definitions/ceph-pr-api.yml
+++ b/ceph-pr-api/config/definitions/ceph-pr-api.yml
@@ -36,6 +36,7 @@
             - ceph
           white-list-target-branches:
             - main
+            - reef
             - quincy
             - pacific
             - octopus

diff --git a/ceph-volume-ansible-prs/build/build b/ceph-volume-ansible-prs/build/build
index 22058092f27087b6a4416e2c69fa5370ad2078c5..c4f71ce90987a60bab002485cd8ae2eb085afbe1 100644 (file)
--- a/ceph-volume-ansible-prs/build/build
+++ b/ceph-volume-ansible-prs/build/build
@@ -37,6 +37,8 @@ elif [[ "$ghprbTargetBranch" == "pacific" ]]; then
     CEPH_ANSIBLE_BRANCH="stable-6.0"
 elif [[ "$ghprbTargetBranch" == "quincy" ]]; then
     CEPH_ANSIBLE_BRANCH="stable-7.0"
+elif [[ "$ghprbTargetBranch" == "reef" ]]; then
+    CEPH_ANSIBLE_BRANCH="stable-8.0"
 else
     CEPH_ANSIBLE_BRANCH="main"
 fi

diff --git a/ceph-volume-nightly/build/build b/ceph-volume-nightly/build/build
index 485631c244ebe0fd3fc5bfd5ab0264ae2f69c923..cebefbfbbd2ce5b3ed1b5894db59281fc10621c1 100644 (file)
--- a/ceph-volume-nightly/build/build
+++ b/ceph-volume-nightly/build/build
@@ -20,6 +20,8 @@ if [[ "$CEPH_BRANCH" == "pacific" ]]; then
     CEPH_ANSIBLE_BRANCH="stable-6.0"
 elif [[ "$CEPH_BRANCH" == "quincy" ]]; then
     CEPH_ANSIBLE_BRANCH="stable-7.0"
+elif [[ "$CEPH_BRANCH" == "reef" ]]; then
+    CEPH_ANSIBLE_BRANCH="stable-8.0"
 else
     CEPH_ANSIBLE_BRANCH="main"
 fi

diff --git a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
index 665d76f30846c7ae55a6b9590a08257178de3e0c..340ff126e47b062691657aad1b107e71a26a8ad5 100644 (file)
--- a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
+++ b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
@@ -12,6 +12,7 @@
       - lvm
     ceph_branch:
       - main
+      - reef
       - quincy
       - pacific
 
@@ -32,6 +33,7 @@
       - batch
     ceph_branch:
       - main
+      - reef
       - quincy
       - pacific
 
@@ -54,6 +56,7 @@
       - batch
     ceph_branch:
       - main
+      - reef
       - quincy
       - pacific
 

diff --git a/ceph-volume-test/config/definitions/ceph-volume-test.yml b/ceph-volume-test/config/definitions/ceph-volume-test.yml
index 56371d98f99db987526ea3bff3cda68963352f7c..a2cb61fe224688f4743d88ce896c9095da17ba00 100644 (file)
--- a/ceph-volume-test/config/definitions/ceph-volume-test.yml
+++ b/ceph-volume-test/config/definitions/ceph-volume-test.yml
@@ -33,13 +33,13 @@
           default: "https://github.com/ceph/ceph.git"
 
     builders:
-      # centos8 based jobs for octopus & pacific & quincy & main
+      # centos8 based jobs for pacific & quincy & reef & main
       - conditional-step:
           condition-kind: shell
           condition-command: |
             #!/bin/bash
             set -x
-            if [[ ! "$CEPH_BRANCH" =~ main|octopus|pacific|quincy ]]; then
+            if [[ ! "$CEPH_BRANCH" =~ main|pacific|quincy|reef ]]; then
               exit 1
             fi
           on-evaluation-failure: dont-run

diff --git a/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml b/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml
index afcb116afb3a9a37fae6bf93e9db4a60343c30b5..03ff22f7b469ba7390acef10e3cfc90b9b150918 100644 (file)
--- a/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml
+++ b/ceph-windows-pull-requests/config/definitions/ceph-windows-pull-requests.yml
@@ -36,6 +36,7 @@
             - ceph
           white-list-target-branches:
             - main
+            - reef
             - quincy
           trigger-phrase: 'jenkins test windows'
           skip-build-phrase: '^jenkins do not test.*'

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index cce078f9d36ce1f4ff33e938d4cb8452a4535b94..82d35c3a9c75af3ebc73d228c92024e3cfe54b6c 100755 (executable)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -1159,7 +1159,7 @@ start_tox() {
         # dev runs will need to be set to the release
         # that matches what the current ceph main
         # branch is at
-        local release="quincy"
+        local release="reef"
     fi
     TOX_RUN_ENV=("timeout 3h")
     if [ -n "$ceph_docker_image_tag" ]; then

diff --git a/scripts/sign-rpms b/scripts/sign-rpms
index d7f0f7c33500c47338ccfc506a9fd9b7967d6887..8d3b24ed036ecc4a9b1fd84f7e88ce7c701d9eb4 100644 (file)
--- a/scripts/sign-rpms
+++ b/scripts/sign-rpms
@@ -21,7 +21,7 @@ keyid=460F3994
 
 if [ $# -eq 0 ]; then
   # Default releases if no arguments passed
-  releases=( mimic nautilus octopus pacific quincy )
+  releases=( pacific quincy reef )
 else
   releases=( "$@" )
 fi

diff --git a/scripts/sync-push b/scripts/sync-push
index 5ef489192b3560402279d28ca026d614dabd0905..c4e96c6deaacc078658ad56f78ba47e279a0520a 100644 (file)
--- a/scripts/sync-push
+++ b/scripts/sync-push
@@ -8,7 +8,7 @@
 # Since the binaries are created with a different repository layout, this
 # script maps directories like "centos/6" to "rpm-$release/el6"
 
-releases=${*:-"nautilus octopus pacific quincy"}
+releases=${*:-"pacific quincy reef"}
 
 ceph_sync() {
   release=$1