From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 10 Feb 2021 12:05:22 +0000 (+0100)
Subject: ceph-ansible: branch stable-6.0
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1739%2Fhead;p=ceph-build.git

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 48c098521..552163fc9 100644
--- 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 324f1f6cb..255a0c6ca 100644
--- 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 20bc7a073..625410418 100644
--- 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