From 8c8176be4c15c31634f26d52d1291c724510623b Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Thu, 19 Oct 2017 10:12:46 +0200
Subject: [PATCH] ceph-ansible-nightly: add new scenarios to nightly
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

For ceph-ansible and ceph-docker.

Signed-off-by: Sébastien Han <seb@redhat.com>
---
 .../definitions/ceph-ansible-nightly.yml      | 30 +++++--------------
 .../definitions/ceph-docker-nightly.yml       |  4 +--
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
index 96b3fce7..818b470c 100644
--- 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 bbf680e5..9f20dfbb 100644
--- 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}'
 
-- 
2.39.5