ceph-ansible: update nightlies definition

- remove testing of stable-2.2 against ceph jewel
- add testing of stable-3.1 against luminous
- update testing of stable-3.0 against luminous:
  - remove lvm scenarios

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

diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
index 6ef44cc070d30ddb77f6e78f923ed76e0bf63c87..267093b2b4d3c38cfdf5f134e58c79d178f78d67 100644 (file)
--- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
+++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
@@ -1,34 +1,37 @@
 - project:
-    name: ceph-ansible-nightly-jewel-stable2.2
+    name: ceph-ansible-nightly-jewel-stable3.0
     release:
       - jewel
     ansible_version:
-      - ansible2.2
       - ansible2.4
     scenario:
       - centos7_cluster
       - xenial_cluster
       - docker_cluster
-      - journal_collocation
-      - dmcrypt_journal
-      - dmcrypt_journal_collocation
-      - purge_cluster
-      - purge_dmcrypt
-      - docker_dedicated_journal
-      - docker_dmcrypt_journal_collocation
-      - update_dmcrypt
       - update_cluster
-      - cluster
-      - purge_docker_cluster
+      - docker_cluster_collocation
+      - update_docker_cluster
+      - switch_to_containers
+      - shrink_mon
+      - shrink_mon_container
+      - shrink_osd
+      - shrink_osd_container
+      - filestore_osds_non_container
+      - filestore_osds_container
+      - purge_cluster_container
+      - purge_cluster_non_container
+      - purge_filestore_osds_container
+      - purge_filestore_osds_non_container
+      - ooo_collocation
     ceph_ansible_branch:
-      - stable-2.2
+      - stable-3.0
     jobs:
       - 'ceph-ansible-nightly-{release}-{ansible_version}-{ceph_ansible_branch}-{scenario}'
 
 - project:
-    name: ceph-ansible-nightly-jewel-stable3.0
+    name: ceph-ansible-nightly-luminous-master
     release:
-      - jewel
+      - luminous
     ansible_version:
       - ansible2.4
     scenario:
@@ -36,6 +39,8 @@
       - xenial_cluster
       - docker_cluster
       - update_cluster
+      - lvm_osds
+      - purge_lvm_osds
       - docker_cluster_collocation
       - update_docker_cluster
       - switch_to_containers
@@ -43,24 +48,29 @@
       - shrink_mon_container
       - shrink_osd
       - shrink_osd_container
+      - bluestore_osds_non_container
+      - bluestore_osds_container
       - filestore_osds_non_container
       - filestore_osds_container
       - purge_cluster_container
       - purge_cluster_non_container
       - purge_filestore_osds_container
       - purge_filestore_osds_non_container
+      - purge_bluestore_osds_container
+      - purge_bluestore_osds_non_container
       - ooo_collocation
     ceph_ansible_branch:
-      - stable-3.0
+      - master
     jobs:
-      - 'ceph-ansible-nightly-{release}-{ansible_version}-{ceph_ansible_branch}-{scenario}'
+        - 'ceph-ansible-nightly-{release}-{ansible_version}-{ceph_ansible_branch}-{scenario}'
 
 - project:
-    name: ceph-ansible-nightly-luminous
+    name: ceph-ansible-nightly-luminous-stable3.1
     release:
       - luminous
     ansible_version:
       - ansible2.4
+      - ansible2.5
     scenario:
       - centos7_cluster
       - xenial_cluster
@@ -86,9 +96,42 @@
       - purge_bluestore_osds_container
       - purge_bluestore_osds_non_container
       - ooo_collocation
+    ceph_ansible_branch:
+      - stable-3.1
+    jobs:
+        - 'ceph-ansible-nightly-{release}-{ansible_version}-{ceph_ansible_branch}-{scenario}'
+
+- project:
+    name: ceph-ansible-nightly-luminous-stable3.0
+    release:
+      - luminous
+    ansible_version:
+      - ansible2.4
+    scenario:
+      - centos7_cluster
+      - xenial_cluster
+      - docker_cluster
+      - update_cluster
+      - docker_cluster_collocation
+      - update_docker_cluster
+      - switch_to_containers
+      - shrink_mon
+      - shrink_mon_container
+      - shrink_osd
+      - shrink_osd_container
+      - bluestore_osds_non_container
+      - bluestore_osds_container
+      - filestore_osds_non_container
+      - filestore_osds_container
+      - purge_cluster_container
+      - purge_cluster_non_container
+      - purge_filestore_osds_container
+      - purge_filestore_osds_non_container
+      - purge_bluestore_osds_container
+      - purge_bluestore_osds_non_container
+      - ooo_collocation
     ceph_ansible_branch:
       - stable-3.0
-      - master
     jobs:
         - 'ceph-ansible-nightly-{release}-{ansible_version}-{ceph_ansible_branch}-{scenario}'