Update releases - add squid, remove pacific and older

... with the exception of ceph-volume jobs.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
index f70af91856db59b6d4c07b8cd15bd07e622e7823..c51321c400cff54c3390df0e0d21bc4e95b427b2 100644 (file)
--- a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
+++ b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
@@ -5,7 +5,6 @@
       - squid
       - reef
       - quincy
-      - pacific
     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 28919fcf39daaccbd7a5fe04821c76f11d7585d4..7314bcf92043f51d3751f8a689979327627270b7 100644 (file)
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -65,7 +65,7 @@
             - condition-kind: and
               condition-operands:
                 - condition-kind: regex-match
-                  regex: (mimic|nautilus|octopus|pacific|quincy|reef)
+                  regex: (mimic|nautilus|octopus|pacific|quincy|reef|squid)
                   label: '${BRANCH}'
                 - condition-kind: regex-match
                   regex: (xenial|bionic|focal|jammy|centos7|centos8|centos9|buster|bullseye|bookworm)

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 8bd3b90136ad4e397d0ad444d62e59b51ab399fd..ed8d7349d380dfbf8db017b24d8222232ebd0fdf 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
@@ -5,7 +5,6 @@
       - squid
       - reef
       - quincy
-      - pacific
     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 2a3f80976ee6f761e95c079296546c98c38a016e..f39aa0dd66799051422bf0b8c4c8e89b47acacca 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/squid
             - origin/reef
             - origin/quincy
-            - origin/pacific
           skip-tag: true
           timeout: 20
           wipe-workspace: true
 
     builders:
-      # build pacific on:
-      # default: focal bionic centos8 leap15
+      # 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:
@@ -55,13 +56,20 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal bionic centos8 leap15
-      # build quincy on:
-      # default: focal centos8 centos9 leap15
-      # crimson: centos8
+                    DISTROS=focal centos8 centos9 leap15
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos8
+                    FLAVOR=crimson
+                    ARCHS=x86_64
+      # build reef on:
+      # default: jammy focal centos8 centos9 windows
+      # crimson: centos8 centos9
       - conditional-step:
           condition-kind: regex-match
-          regex: .*quincy.*
+          regex: .*reef.*
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps:
@@ -74,20 +82,20 @@
                   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}
                     FORCE=True
-                    DISTROS=centos8
+                    DISTROS=centos8 centos9
                     FLAVOR=crimson
                     ARCHS=x86_64
-      # build reef on:
+      # build squid on:
       # default: jammy focal centos8 centos9 windows
       # crimson: centos8 centos9
       - conditional-step:
           condition-kind: regex-match
-          regex: .*reef.*
+          regex: .*squid.*
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps:

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 ed66fe5a663dd527d9e096f966242eadc762f00c..50ce0ff1d421a621ef50ae66719ca3a5760cb4af 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,12 +169,38 @@
                     DISTROS=centos8 centos9
                     FLAVOR=crimson
                     ARCHS=x86_64
+      # build squid on:
+      # default: jammy focal centos8 centos9 windows
+      # crimson: centos8 centos9
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*squid.*
+          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 centos9
+                    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\|reef\|centos9-only\|crimson-only\|jaeger\)'
+            echo "${GIT_BRANCH}" | grep -v '\(luminous\|mimic\|nautilus\|octopus\|pacific\|quincy\|reef\|squid\|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 308aa71790a376f0b821636fb482eca1807790f0..b944bb2c9750bb49025ec5e2fea67f2abc07d368 100644 (file)
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -26,44 +26,20 @@
           browser: auto
           branches:
             - 'origin/main'
-            - 'origin/jewel'
-            - 'origin/kraken'
-            - 'origin/hammer'
-            - 'origin/luminous'
-            - 'origin/mimic*'
-            - 'origin/nautilus'
-            - 'origin/octopus'
-            - 'origin/pacific'
             - 'origin/quincy'
             - 'origin/reef'
+            - 'origin/squid'
           skip-tag: true
           timeout: 20
           wipe-workspace: true
 
     builders:
-      # build nautilus on:
-      # default: bionic xenial centos7 centos8
-      - conditional-step:
-          condition-kind: regex-match
-          regex: .*nautilus.*
-          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=bionic xenial centos7 centos8
-      # build octopus on:
-      # default: focal bionic centos7 centos8 leap15
+      # build quincy on:
+      # default: focal centos8 leap15
+      # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
-          regex: .*octopus.*
+          regex: .*quincy.*
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps:
@@ -76,31 +52,19 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal bionic centos7 centos8 leap15
-      # build pacific on:
-      # default: focal bionic centos8 leap15
-      - conditional-step:
-          condition-kind: regex-match
-          regex: .*pacific.*
-          label: '${GIT_BRANCH}'
-          on-evaluation-failure: dont-run
-          steps:
-            - shell:
-                !include-raw:
-                - ../../../scripts/build_utils.sh
-                - ../../build/notify
-            - trigger-builds:
+                    DISTROS=focal centos8 leap15
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal bionic centos8 leap15
-      # build quincy on:
-      # default: focal centos8 leap15
-      # crimson: centos8
+                    DISTROS=centos8
+                    FLAVOR=crimson
+      # build reef on:
+      # default: jammy focal centos8 centos9
+      # crimson: centos8 centos9
       - conditional-step:
           condition-kind: regex-match
-          regex: .*quincy.*
+          regex: .*reef.*
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps:
@@ -113,19 +77,19 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal centos8 leap15
+                    DISTROS=jammy focal centos8 centos9
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=centos8
+                    DISTROS=centos8 centos9
                     FLAVOR=crimson
-      # build reef on:
+      # build squid on:
       # default: jammy focal centos8 centos9
       # crimson: centos8 centos9
       - conditional-step:
           condition-kind: regex-match
-          regex: .*reef.*
+          regex: .*squid.*
           label: '${GIT_BRANCH}'
           on-evaluation-failure: dont-run
           steps:

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 7e6e2c2acfdaaaf05b9917ec46418dddec28e29d..8d5acd9f530d9575eef0be9d39b2fa70e6f3dd7f 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="reef quincy pacific octopus"
+          RELEASES="squid 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/scripts/build_utils.sh b/scripts/build_utils.sh
index d3db52effb1d31e9d5b69a554fbef11c9303700a..63eddd603137b5a9d7a4ae14995547413a649a87 100755 (executable)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -1178,7 +1178,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="reef"
+        local release="squid"
     fi
     TOX_RUN_ENV=("timeout 3h")
     if [ -n "$ceph_docker_image_tag" ]; then

diff --git a/scripts/sign-rpms b/scripts/sign-rpms
index a95744a27580c419482e212871679ece08f1b8a0..881bdd3004fcbaaabcf67e0300a9dfa27fd87197 100755 (executable)
--- 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=( pacific quincy reef )
+  releases=( quincy reef squid )
 else
   releases=( "$@" )
 fi

diff --git a/scripts/sync-push b/scripts/sync-push
index d7ae37c9227b7d513cad21a0b68e6ddf375bdc0f..53cdc50bee6c6af161dfeb81986cddc4eab95b78 100755 (executable)
--- a/scripts/sync-push
+++ b/scripts/sync-push
@@ -12,7 +12,7 @@
 # pull an in-progress release
 prerelease_dir=/data/download.ceph.com/www/prerelease
 
-releases=${*:-"pacific quincy reef"}
+releases=${*:-"quincy reef squid"}
 
 ceph_sync() {
   release=$1