ceph-volume: add centos 8 based jobs for master and octopus

Signed-off-by: Rishabh Dave <ridave@redhat.com>

diff --git a/ceph-volume-test/config/definitions/ceph-volume-test.yml b/ceph-volume-test/config/definitions/ceph-volume-test.yml
index ba8d086dd24c8bfa1ffe050c6e88e1c4d937099a..59c2038eb2d2b9811ac47f563cde205b52e58044 100644 (file)
--- a/ceph-volume-test/config/definitions/ceph-volume-test.yml
+++ b/ceph-volume-test/config/definitions/ceph-volume-test.yml
@@ -33,50 +33,82 @@
           default: "https://github.com/ceph/ceph.git"
 
     builders:
-      - multijob:
-          name: 'testing ceph-volume lvm'
-          condition: SUCCESSFUL
-          projects:
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=xenial-bluestore-create
-                SUBCOMMAND=lvm
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=xenial-filestore-create
-                SUBCOMMAND=lvm
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=centos7-bluestore-create
-                SUBCOMMAND=lvm
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=centos7-filestore-create
-                SUBCOMMAND=lvm
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=xenial-bluestore-dmcrypt
-                SUBCOMMAND=lvm
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=xenial-filestore-dmcrypt
-                SUBCOMMAND=lvm
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=centos7-bluestore-dmcrypt
-                SUBCOMMAND=lvm
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=centos7-filestore-dmcrypt
-                SUBCOMMAND=lvm
+      # centos8 based jobs for octopus & master
+      - conditional-step:
+          condition-kind: shell
+          condition-command: |
+            #!/bin/bash
+            set -x
+            if [[ ! "$CEPH_BRANCH" =~ master|octopus ]]; then
+              exit 1
+            fi
+          on-evaluation-failure: dont-run
+          steps:
+          - multijob:
+              name: 'testing ceph-volume lvm'
+              condition: SUCCESSFUL
+              projects:
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-bluestore-create
+                    SUBCOMMAND=lvm
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-filestore-create
+                    SUBCOMMAND=lvm
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-bluestore-dmcrypt
+                    SUBCOMMAND=lvm
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-filestore-dmcrypt
+                    SUBCOMMAND=lvm
+          - multijob:
+              name: 'testing ceph-volume batch'
+              condition: SUCCESSFUL
+              projects:
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-bluestore-single_type
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-bluestore-single_type_dmcrypt
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-filestore-single_type
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-filestore-single_type_dmcrypt
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-bluestore-mixed_type
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-filestore-mixed_type
+                    SUBCOMMAND=batch
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos8-bluestore-mixed_type_dmcrypt
+                    SUBCOMMAND=batch
+
+      # centos7 and xenial based jobs for pre-octopus releases
       - conditional-step:
           condition-kind: shell
           condition-command: |
@@ -89,130 +121,174 @@
           on-evaluation-failure: dont-run
           steps:
           - multijob:
-              name: 'testing ceph-volume simple'
+              name: 'testing ceph-volume lvm'
+              condition: SUCCESSFUL
+              projects:
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=xenial-bluestore-create
+                    SUBCOMMAND=lvm
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=xenial-filestore-create
+                    SUBCOMMAND=lvm
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos7-bluestore-create
+                    SUBCOMMAND=lvm
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos7-filestore-create
+                    SUBCOMMAND=lvm
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=xenial-bluestore-dmcrypt
+                    SUBCOMMAND=lvm
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=xenial-filestore-dmcrypt
+                    SUBCOMMAND=lvm
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos7-bluestore-dmcrypt
+                    SUBCOMMAND=lvm
+                - name: ceph-volume-scenario
+                  current-parameters: true
+                  predefined-parameters: |
+                    SCENARIO=centos7-filestore-dmcrypt
+                    SUBCOMMAND=lvm
+          - multijob:
+             name: 'testing ceph-volume simple'
+             condition: SUCCESSFUL
+             projects:
+               - name: ceph-volume-scenario
+                 current-parameters: true
+                 predefined-parameters: |
+                   SCENARIO=xenial-bluestore-activate
+                   SUBCOMMAND=simple
+               - name: ceph-volume-scenario
+                 current-parameters: true
+                 predefined-parameters: |
+                   SCENARIO=xenial-filestore-activate
+                   SUBCOMMAND=simple
+               - name: ceph-volume-scenario
+                 current-parameters: true
+                 predefined-parameters: |
+                   SCENARIO=centos7-bluestore-activate
+                   SUBCOMMAND=simple
+               - name: ceph-volume-scenario
+                 current-parameters: true
+                 predefined-parameters: |
+                   SCENARIO=centos7-filestore-activate
+                   SUBCOMMAND=simple
+               - name: ceph-volume-scenario
+                 current-parameters: true
+                 predefined-parameters: |
+                   SCENARIO=xenial-bluestore-dmcrypt_luks
+                   SUBCOMMAND=simple
+               - name: ceph-volume-scenario
+                 current-parameters: true
+                 predefined-parameters: |
+                   SCENARIO=xenial-filestore-dmcrypt_luks
+                   SUBCOMMAND=simple
+               - name: ceph-volume-scenario
+                 current-parameters: true
+                 predefined-parameters: |
+                   SCENARIO=centos7-bluestore-dmcrypt_luks
+                   SUBCOMMAND=simple
+               - name: ceph-volume-scenario
+                 current-parameters: true
+                 predefined-parameters: |
+                   SCENARIO=centos7-filestore-dmcrypt_luks
+                   SUBCOMMAND=simple
+               - name: ceph-volume-scenario
+                 current-parameters: true
+                 predefined-parameters: |
+                   SCENARIO=xenial-bluestore-dmcrypt_plain
+                   SUBCOMMAND=simple
+               - name: ceph-volume-scenario
+                 current-parameters: true
+                 predefined-parameters: |
+                   SCENARIO=xenial-filestore-dmcrypt_plain
+                   SUBCOMMAND=simple
+               - name: ceph-volume-scenario
+                 current-parameters: true
+                 predefined-parameters: |
+                   SCENARIO=centos7-bluestore-dmcrypt_plain
+                   SUBCOMMAND=simple
+               - name: ceph-volume-scenario
+                 current-parameters: true
+                 predefined-parameters: |
+                   SCENARIO=centos7-filestore-dmcrypt_plain
+                   SUBCOMMAND=simple
+          - multijob:
+              name: 'testing ceph-volume batch'
               condition: SUCCESSFUL
               projects:
                 - name: ceph-volume-scenario
                   current-parameters: true
                   predefined-parameters: |
-                    SCENARIO=xenial-bluestore-activate
-                    SUBCOMMAND=simple
+                    SCENARIO=centos7-bluestore-single_type
+                    SUBCOMMAND=batch
                 - name: ceph-volume-scenario
                   current-parameters: true
                   predefined-parameters: |
-                    SCENARIO=xenial-filestore-activate
-                    SUBCOMMAND=simple
+                    SCENARIO=centos7-bluestore-single_type_dmcrypt
+                    SUBCOMMAND=batch
                 - name: ceph-volume-scenario
                   current-parameters: true
                   predefined-parameters: |
-                    SCENARIO=centos7-bluestore-activate
-                    SUBCOMMAND=simple
+                    SCENARIO=centos7-filestore-single_type
+                    SUBCOMMAND=batch
                 - name: ceph-volume-scenario
                   current-parameters: true
                   predefined-parameters: |
-                    SCENARIO=centos7-filestore-activate
-                    SUBCOMMAND=simple
+                    SCENARIO=centos7-filestore-single_type_dmcrypt
+                    SUBCOMMAND=batch
                 - name: ceph-volume-scenario
                   current-parameters: true
                   predefined-parameters: |
-                    SCENARIO=xenial-bluestore-dmcrypt_luks
-                    SUBCOMMAND=simple
+                    SCENARIO=xenial-bluestore-single_type
+                    SUBCOMMAND=batch
                 - name: ceph-volume-scenario
                   current-parameters: true
                   predefined-parameters: |
-                    SCENARIO=xenial-filestore-dmcrypt_luks
-                    SUBCOMMAND=simple
+                    SCENARIO=xenial-bluestore-single_type_dmcrypt
+                    SUBCOMMAND=batch
                 - name: ceph-volume-scenario
                   current-parameters: true
                   predefined-parameters: |
-                    SCENARIO=centos7-bluestore-dmcrypt_luks
-                    SUBCOMMAND=simple
+                    SCENARIO=xenial-filestore-single_type
+                    SUBCOMMAND=batch
                 - name: ceph-volume-scenario
                   current-parameters: true
                   predefined-parameters: |
-                    SCENARIO=centos7-filestore-dmcrypt_luks
-                    SUBCOMMAND=simple
+                    SCENARIO=xenial-filestore-single_type_dmcrypt
+                    SUBCOMMAND=batch
                 - name: ceph-volume-scenario
                   current-parameters: true
                   predefined-parameters: |
-                    SCENARIO=xenial-bluestore-dmcrypt_plain
-                    SUBCOMMAND=simple
+                    SCENARIO=centos7-bluestore-mixed_type
+                    SUBCOMMAND=batch
                 - name: ceph-volume-scenario
                   current-parameters: true
                   predefined-parameters: |
-                    SCENARIO=xenial-filestore-dmcrypt_plain
-                    SUBCOMMAND=simple
+                    SCENARIO=xenial-bluestore-single_type
+                    SUBCOMMAND=batch
                 - name: ceph-volume-scenario
                   current-parameters: true
                   predefined-parameters: |
-                    SCENARIO=centos7-bluestore-dmcrypt_plain
-                    SUBCOMMAND=simple
+                    SCENARIO=centos7-filestore-mixed_type
+                    SUBCOMMAND=batch
                 - name: ceph-volume-scenario
                   current-parameters: true
                   predefined-parameters: |
-                    SCENARIO=centos7-filestore-dmcrypt_plain
-                    SUBCOMMAND=simple
-      - multijob:
-          name: 'testing ceph-volume batch'
-          condition: SUCCESSFUL
-          projects:
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=centos7-bluestore-single_type
-                SUBCOMMAND=batch
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=centos7-bluestore-single_type_dmcrypt
-                SUBCOMMAND=batch
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=centos7-filestore-single_type
-                SUBCOMMAND=batch
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=centos7-filestore-single_type_dmcrypt
-                SUBCOMMAND=batch
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=xenial-bluestore-single_type
-                SUBCOMMAND=batch
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=xenial-bluestore-single_type_dmcrypt
-                SUBCOMMAND=batch
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=xenial-filestore-single_type
-                SUBCOMMAND=batch
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=xenial-filestore-single_type_dmcrypt
-                SUBCOMMAND=batch
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=centos7-bluestore-mixed_type
-                SUBCOMMAND=batch
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=xenial-bluestore-single_type
-                SUBCOMMAND=batch
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=centos7-filestore-mixed_type
-                SUBCOMMAND=batch
-            - name: ceph-volume-scenario
-              current-parameters: true
-              predefined-parameters: |
-                SCENARIO=centos7-bluestore-mixed_type_dmcrypt
-                SUBCOMMAND=batch
+                    SCENARIO=centos7-bluestore-mixed_type_dmcrypt
+                    SUBCOMMAND=batch