From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 9 Jul 2019 20:02:32 +0000 (-0500)
Subject: ceph-volume: only test simple on mimic and luminous branches
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1332%2Fhead;p=ceph-build.git

ceph-volume: only test simple on mimic and luminous branches

Signed-off-by: Andrew Schoen <aschoen@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 c322842a..df27868a 100644
--- a/ceph-volume-test/config/definitions/ceph-volume-test.yml
+++ b/ceph-volume-test/config/definitions/ceph-volume-test.yml
@@ -77,70 +77,80 @@
               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
+      - conditional-step:
+          condition-kind: shell
+          condition-command: |
+            #!/bin/bash
+            set -x
+            # if the target branch is luminous or mimic we run these tests.
+            if [[ "$CEPH_BRANCH" =~ luminous|mimic ]]; then
+              exit 0
+            fi
+          steps:
+          - 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