ceph-ansible-nightly: add new scenarios to nightly

For ceph-ansible and ceph-docker.

Signed-off-by: Sébastien Han <seb@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 96b3fce785d6406140b97dece005b2bcbe26f297..818b470c4246d115b9d6cf14dbae8786f8c2d386 100644 (file)
--- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
+++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
@@ -1,24 +1,19 @@
 - project:
     name: ceph-ansible-nightly
     release:
-      - jewel 
+      - jewel
     ansible_version:
       - ansible2.3
     scenario:
       - centos7_cluster
       - xenial_cluster
-      - journal_collocation
-      - dmcrypt_journal
-      - dmcrypt_journal_collocation
       - docker_cluster
-      - docker_dedicated_journal
-      - docker_dmcrypt_journal_collocation
       - purge_cluster
-      - purge_dmcrypt
-      - update_dmcrypt
       - update_cluster
       - purge_docker_cluster
       - update_docker_cluster
+      - filestore_osds_non_container
+      - filestore_osds_container
     jobs:
         - 'ceph-ansible-nightly-{release}-{ansible_version}-{scenario}'
 
@@ -35,30 +30,19 @@
       - update_cluster
       - lvm_osds
       - purge_lvm_osds
-      - journal_collocation
-      - journal_collocation_auto
-      - journal_collocation_auto_dmcrypt
-      - dmcrypt_journal
-      - dmcrypt_journal_collocation
       - docker_cluster_collocation
-      - docker_dedicated_journal
-      - docker_dmcrypt_journal_collocation
       - purge_cluster
-      - purge_dmcrypt
-      - update_dmcrypt
       - purge_docker_cluster
       - update_docker_cluster
-      - bluestore_cluster
-      - bluestore_journal_collocation
-      - bluestore_dmcrypt_journal
-      - bluestore_dmcrypt_journal_collocation
-      - bluestore_docker_dedicated_journal
-      - bluestore_docker_dmcrypt_journal_collocation
       - 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
     jobs:
         - 'ceph-ansible-nightly-{release}-{ansible_version}-{scenario}'
 

diff --git a/ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml b/ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml
index bbf680e5b29c3e93f45fc7fb7f0094e38c70343a..9f20dfbbc8b0bedd03470618777faff2fc145af7 100644 (file)
--- a/ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml
+++ b/ceph-docker-nightly/config/definitions/ceph-docker-nightly.yml
@@ -8,8 +8,8 @@
       - luminous
     test:
       - cluster
-      - dedicated_journal
-      - dmcrypt_journal_collocation
+      - bluestore_osds_container
+      - filestore_osds_container
     jobs:
         - 'ceph-docker-nightly-ceph_ansible-{ceph-version}-{os}-{test}'