ceph-ansible: branch stable-6.0

This commit brings the required modification to branch stable-6.0

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/ceph-ansible-docs/config/definitions/ceph-ansible-docs.yml b/ceph-ansible-docs/config/definitions/ceph-ansible-docs.yml
index 48c0985216527a6b2bb617d88c60457affe6b2cb..552163fc9419a5fd0835537d40fb859a4b35b728 100644 (file)
--- a/ceph-ansible-docs/config/definitions/ceph-ansible-docs.yml
+++ b/ceph-ansible-docs/config/definitions/ceph-ansible-docs.yml
@@ -32,6 +32,7 @@
             - stable-3.2
             - stable-4.0
             - stable-5.0
+            - stable-6.0
           browser: auto
           skip-tag: true
           timeout: 20

diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
index 324f1f6cb241182b2d0b8c5dfb43dc2ca00ba030..255a0c6ca82efd44ad9d12ccd0e83023d489eb1d 100644 (file)
--- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
+++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
@@ -89,6 +89,37 @@
       - deployment: container
         scenario: switch_to_containers
 
+- project:
+    name: ceph-ansible-nightly-stable6.0
+    release:
+      - pacific
+    distribution:
+      - centos
+    deployment:
+      - container
+      - non_container
+    scenario:
+      - all_daemons
+      - collocation
+      - update
+      - lvm_osds
+      - shrink_mon
+      - shrink_osd_multiple
+      - shrink_osd_single
+      - lvm_batch
+      - add_osds
+      - rgw_multisite
+      - purge
+      - lvm_auto_discovery
+      - switch_to_containers
+    ceph_ansible_branch:
+      - stable-6.0
+    jobs:
+        - 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
+    exclude:
+      - deployment: container
+        scenario: switch_to_containers
+
 - job-template:
     name: 'ceph-ansible-nightly-{release}-{distribution}-{deployment}-{ceph_ansible_branch}-{scenario}'
     node: vagrant&&libvirt&&centos7

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 20bc7a07386a01cb82c3b3994019d3d5a59867ba..62541041832370377884d4c553b0fcad8e8b059d 100644 (file)
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -1002,7 +1002,7 @@ if [ "$release" = "dev" ]; then
     # dev runs will need to be set to the release
     # that matches what the current ceph master
     # branch is at
-    local release="nautilus"
+    local release="quincy"
 fi
 TOX_RUN_ENV=("timeout 3h")
 if [ -n "$ceph_docker_image_tag" ]; then