From a6b8bf5c2c8fda145ced96db8ade4ba75e7ccda1 Mon Sep 17 00:00:00 2001
From: Rishabh Dave <ridave@redhat.com>
Date: Wed, 26 Feb 2020 17:45:27 +0530
Subject: [PATCH] ceph-volume: add missing scenarios

Signed-off-by: Rishabh Dave <ridave@redhat.com>
---
 .../config/definitions/ceph-volume-test.yml   | 86 ++++++++++++++++++-
 1 file changed, 85 insertions(+), 1 deletion(-)

diff --git a/ceph-volume-test/config/definitions/ceph-volume-test.yml b/ceph-volume-test/config/definitions/ceph-volume-test.yml
index 8c97948f..6141bb7b 100644
--- a/ceph-volume-test/config/definitions/ceph-volume-test.yml
+++ b/ceph-volume-test/config/definitions/ceph-volume-test.yml
@@ -107,6 +107,31 @@
                   predefined-parameters: |
                     SCENARIO=centos8-bluestore-mixed_type_dmcrypt
                     SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-filestore-mixed_type_dmcrypt
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-bluestore-mixed_type_explicit
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-filestore-mixed_type_explicit
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-bluestore-mixed_type_dmcrypt_explicit
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-filestore-mixed_type_dmcrypt_explicit
+                    SUBCOMMAND=batch
 
       # centos7 and xenial based jobs for pre-octopus releases
       - conditional-step:
@@ -268,6 +293,31 @@
                   predefined-parameters: |
                     SCENARIO=centos7-bluestore-mixed_type_dmcrypt
                     SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos7-filestore-mixed_type_dmcrypt
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos7-bluestore-mixed_type_explicit
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos7-filestore-mixed_type_explicit
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos7-bluestore-mixed_type_dmcrypt_explicit
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos7-filestore-mixed_type_dmcrypt_explicit
+                    SUBCOMMAND=batch
 
                 - name: ceph-volume-scenario
                   current-parameters: true
@@ -292,5 +342,39 @@
                 - name: ceph-volume-scenario
                   current-parameters: true
                   predefined-parameters: |
-                    SCENARIO=xenial-bluestore-single_type
+                    SCENARIO=xenial-bluestore-mixed_type
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=xenial-filestore-mixed_type
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=xenial-bluestore-mixed_type_dmcrypt
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=xenial-filestore-mixed_type_dmcrypt
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=xenial-bluestore-mixed_type_explicit
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=xenial-filestore-mixed_type_explicit
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=xenial-bluestore-mixed_type_dmcrypt_explicit
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=xenial-filestore-mixed_type_dmcrypt_explicit
                     SUBCOMMAND=batch
-- 
2.47.3