add pacific targets

diff --git a/ceph-api-nightly/config/definitions/ceph-api-nightly.yml b/ceph-api-nightly/config/definitions/ceph-api-nightly.yml
index e7df93fe37ef1ff75d589597c84254fb4fb78125..d93509a4a3a82d45deba39fb0c9fbf8479a943e2 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:
       - master
+      - pacific
       - octopus
       - nautilus:
           ceph_build: "export CHECK_MAKEOPTS='-N -Q'; timeout 2h ./run-make-check.sh"

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

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 84a4b60cae454c07ece7b6b142391c909fd6dedd..dcfb3600ce445893ff840ecb18951b57c35798f5 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
@@ -133,7 +133,7 @@
       - conditional-step:
           condition-kind: shell
           condition-command: |
-            echo "${GIT_BRANCH}" | grep -v '\(luminous\|mimic\|nautilus\|octopus\)'
+            echo "${GIT_BRANCH}" | grep -v '\(luminous\|mimic\|nautilus\|octopus\|pacific\)'
           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 e4da544cda2839f6a7786a42f466b30f6e0e4555..0989cbec59c1b94bb10a56415b6a8f73a7fc52e2 100644 (file)
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -32,6 +32,7 @@
             - 'origin/mimic*'
             - 'origin/nautilus'
             - 'origin/octopus'
+            - 'origin/pacific'
           skip-tag: true
           timeout: 20
           wipe-workspace: true

diff --git a/ceph-pr-api/config/definitions/ceph-pr-api.yml b/ceph-pr-api/config/definitions/ceph-pr-api.yml
index f2409148e769063d900a13a51b832be1a41c5b1c..dd4da1f8aaccdb7c2ae40c125b504936725761ec 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:
             - master
+            - pacific
             - octopus
             - nautilus
           trigger-phrase: 'jenkins test api'

diff --git a/ceph-volume-ansible-prs/build/build b/ceph-volume-ansible-prs/build/build
index 644b22cbfa0971eb7f495621d8e11cb61de9c5af..d8d3e050cbd96495a944a5b36f50e16381131703 100644 (file)
--- a/ceph-volume-ansible-prs/build/build
+++ b/ceph-volume-ansible-prs/build/build
@@ -30,6 +30,8 @@ elif [[ "$ghprbTargetBranch" == "nautilus" ]]; then
     CEPH_ANSIBLE_BRANCH="stable-4.0"
 elif [[ "$ghprbTargetBranch" == "octopus" ]]; then
     CEPH_ANSIBLE_BRANCH="stable-5.0"
+elif [[ "$ghprbTargetBranch" == "pacific" ]]; then
+    CEPH_ANSIBLE_BRANCH="stable-6.0"
 else
     CEPH_ANSIBLE_BRANCH="master"
 fi

diff --git a/ceph-volume-test/config/definitions/ceph-volume-test.yml b/ceph-volume-test/config/definitions/ceph-volume-test.yml
index 6141bb7b3ab816332421983f3dbc8534c1a86fb1..e5ebd2206a0b77cecbaf3e64ea113268ffdfae96 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 & master
+      # centos8 based jobs for octopus & pacific & master
       - conditional-step:
           condition-kind: shell
           condition-command: |
             #!/bin/bash
             set -x
-            if [[ ! "$CEPH_BRANCH" =~ master|octopus ]]; then
+            if [[ ! "$CEPH_BRANCH" =~ master|octopus|pacific ]]; then
               exit 1
             fi
           on-evaluation-failure: dont-run

diff --git a/scripts/sign-rpms b/scripts/sign-rpms
index 0fc7e9dc513cc02e507b231d782d044c9f2dda4e..c20b77c190a496d1efdba127ddc2979e14e4985b 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 )
+  releases=( mimic nautilus octopus pacific )
 else
   releases=( "$@" )
 fi

diff --git a/scripts/sync-push b/scripts/sync-push
index 9aa2479530b1a22db0be4b0946ba465c1eab404b..c18e2d73962c005fc6c57704a15aed234747a3d2 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"}
+releases=${*:-"nautilus octopus pacific"}
 
 ceph_sync() {
   release=$1