*: update relevant scripts and triggers for tentacle

Signed-off-by: Patrick Donnelly <batrick@batbytes.com>

diff --git a/attic/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/attic/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
index 2b6df8f8a1c40acee524c6b47854d0f29f2b7c08..deeb4bbe65d409e85ebdbddca22f441825a09d31 100644 (file)
--- a/attic/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/attic/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -29,6 +29,7 @@
             - 'origin/quincy'
             - 'origin/reef'
             - 'origin/squid'
+            - 'origin/tentacle'
           skip-tag: true
           timeout: 20
           wipe-workspace: true
@@ -102,6 +103,31 @@
                     FORCE=True
                     DISTROS=centos9
                     FLAVOR=crimson
+      # build tentacle on:
+      # default: jammy focal centos8 centos9
+      # crimson: centos8 centos9
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*tentacle.*
+          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=centos9
+                    FLAVOR=crimson
       # build main on:
       # default: jammy focal centos8 centos9
       # crimson: centos9

diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
index bf66703a1401ada544210a89dfaceba19f5cf585..728bda30f825d66494e27e5af45d4abb4e261eaa 100644 (file)
--- a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
+++ b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
@@ -2,6 +2,7 @@
     name: ceph-api-nightly
     ceph_branch:
       - main
+      - tentacle
       - squid
       - reef
     test_suite:

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 039483eece64b121b4147e67a01c7aedabd7274b..d7de28937c59df08eb76e07a6dafcd65a6d8477d 100644 (file)
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -62,7 +62,7 @@
             - condition-kind: and
               condition-operands:
                 - condition-kind: regex-match
-                  regex: (reef|squid)
+                  regex: (reef|squid|tentacle)
                   label: '${{BRANCH}}'
                 - condition-kind: regex-match
                   regex: (focal|jammy|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 3f586ffd0cad082f99acadeb399950043f426ba0..9bd989295b03896290b60f9def7d5d8bce7e14f7 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,6 +2,7 @@
     name: ceph-dashboard-cephadm-e2e-nightly
     ceph_branch:
       - main
+      - tentacle
       - squid
       - reef
     jobs:

diff --git a/ceph-dev-build/build/build_osc b/ceph-dev-build/build/build_osc
index ccfd91cf2ace40382448c8c4b792115c2dfa314c..f86f1d234583167f1c2092dfe11b5d532edddde0 100644 (file)
--- a/ceph-dev-build/build/build_osc
+++ b/ceph-dev-build/build/build_osc
@@ -2,6 +2,9 @@
 set -ex
 
 case $RELEASE_BRANCH in
+tentacle)
+    OBSREPO="openSUSE_Leap_15.3"
+    ;;
 squid)
     OBSREPO="openSUSE_Leap_15.3"
     ;;

diff --git a/ceph-dev-build/build/setup_osc b/ceph-dev-build/build/setup_osc
index 19777f0bbdab9f2a0ee1e5490379a3336162e89a..56aa2715ac4fb0179966a1ac8cd689faa8b89ad9 100644 (file)
--- a/ceph-dev-build/build/setup_osc
+++ b/ceph-dev-build/build/setup_osc
@@ -38,6 +38,10 @@ raw_version=`echo $vers | cut -d '-' -f 1`
 
 RELEASE_BRANCH=$(release_from_version $raw_version)
 case $RELEASE_BRANCH in
+tentacle)
+    DISTRO=opensuse
+    RELEASE="15.3"
+    ;;
 squid)
     DISTRO=opensuse
     RELEASE="15.3"

diff --git a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
index bcb894d1c343f20c95ef348bfe4f4edba9278fbd..da4276b6fe4f21ce581154dd2d6f367c51e7ffd3 100644 (file)
--- a/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
+++ b/ceph-dev-cron/config/definitions/ceph-dev-cron.yml
@@ -30,6 +30,7 @@
           browser: auto
           branches:
             - origin/main
+            - origin/tentacle
             - origin/squid
             - origin/reef
           skip-tag: true
@@ -89,6 +90,32 @@
                     DISTROS=centos9
                     FLAVOR=crimson
                     ARCHS=x86_64
+      # build tentacle on:
+      # default: jammy centos9 windows
+      # crimson: centos9
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*tentacle.*
+          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 centos9 windows
+                - project: 'ceph-dev'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos9
+                    FLAVOR=crimson
+                    ARCHS=x86_64
       # build main on:
       # default: jammy centos9 windows
       # crimson: centos9

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 a0b13f1aa5ec8104a0e5b4d2982e3ddae865d3fb..2543aa4c9b0db940a6fb7080f8b9f5868ef6812f 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
@@ -81,12 +81,38 @@
                     DISTROS=centos9
                     FLAVOR=crimson
                     ARCHS=x86_64
+      # build tentacle on:
+      # default: jammy centos9 windows
+      # crimson: centos9
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*tentacle.*
+          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 centos9 windows
+                - project: 'ceph-dev-new'
+                  predefined-parameters: |
+                    BRANCH=${GIT_BRANCH}
+                    FORCE=True
+                    DISTROS=centos9
+                    FLAVOR=crimson
+                    ARCHS=x86_64
       # If no release name is found in branch, build on all possible distro/flavor combos (except xenial, bionic, focal).
       # 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 '\(reef\|squid\|centos9-only\|crimson-only\|jaeger\)'
+            echo "${{GIT_BRANCH}}" | grep -v '\(reef\|squid\|tentacle\|centos9-only\|crimson-only\|jaeger\)'
           on-evaluation-failure: dont-run
           steps:
             - shell:

diff --git a/ceph-pr-api/config/definitions/ceph-pr-api.yml b/ceph-pr-api/config/definitions/ceph-pr-api.yml
index dd47e3cd9b7a9d9b466b09185c86fea65644eaef..b2afd6a96d6183db0e827f40843436eba52160d4 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
+            - tentacle
             - squid
             - reef
             - "feature-.*"

diff --git a/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml b/ceph-volume-nightly/config/definitions/ceph-volume-nightly.yml
index b092c48fefa28b9d7438b3b692458618989afee2..556ab71bccb3a97526b9aeaf8bc0cd26eba05755 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 @@
       - dmcrypt
     ceph_branch:
       - main
+      - tentacle
       - squid
       - reef
 

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 b89d9ca02d3d018e48431f099d46963310819c86..abd1d797a7133580b55120a3a5511ac1ccfd52c5 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
+            - tentacle
             - squid
             - reef
           trigger-phrase: 'jenkins test windows'

diff --git a/scripts/sign-rpms b/scripts/sign-rpms
index 39f0e091ac2f802ca21dbbf5f06e260e8adc37b9..799672791067ab5f8dbae31d105e52089446d809 100755 (executable)
--- a/scripts/sign-rpms
+++ b/scripts/sign-rpms
@@ -30,7 +30,7 @@ project=$1; shift
 
 if [ $# -eq 0 ]; then
   # Default releases if no arguments passed
-  releases=( reef squid )
+  releases=( reef squid tentacle )
 else
   releases=( "$@" )
 fi

diff --git a/scripts/sync-push b/scripts/sync-push
index 1eacdb977b8f4b4f5c04dba0f2de83dbf669b38b..eb29cd90e08a60cd31be790044563e733f33d18e 100755 (executable)
--- a/scripts/sync-push
+++ b/scripts/sync-push
@@ -22,7 +22,7 @@ project=$1; shift
 prerelease_dir=/data/download.ceph.com/www/prerelease/${project}
 
 if [[ "$project" == "ceph" ]] ; then
-  releases=${*:-"reef squid"}
+  releases=${*:-"reef squid tentacle"}
 else
   releases=$*
 fi