From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 15 Nov 2018 21:22:35 +0000 (+0100)
Subject: ceph-ansible-pipeline: remove old scenario from stable-3.2 tests
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fed013ca243ea001493803e5b2ccd146b5545cb1;p=ceph-build.git

ceph-ansible-pipeline: remove old scenario from stable-3.2 tests

filestore|bluestore old osds scenarios shouldn't be run when branch is
stable-3.2

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
index 2880346d..9182a75f 100644
--- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
+++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
@@ -311,8 +311,8 @@
           condition-command: |
             #!/bin/bash
             set -x
-            # if the target branch is master then we DON'T RUN these tests
-            if [[ "$ghprbTargetBranch" == "master" ]]; then
+            # if the target branch is master or stable-3.2 then we DON'T RUN these tests
+            if [[ "$ghprbTargetBranch" =~ stable-3.2|master ]]; then
               exit 1
             fi
             git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -E 'roles/ceph-defaults/tasks/facts.yml|roles/ceph-osd|ceph-validate'
@@ -323,8 +323,6 @@
                 condition: SUCCESSFUL
                 execution-type: PARALLEL
                 projects:
-                  - name: 'ceph-ansible-prs-luminous-bluestore_lvm_osds'
-                    current-parameters: true
                   - name: 'ceph-ansible-prs-luminous-bluestore_osds_container'
                     current-parameters: true
                   - name: 'ceph-ansible-prs-luminous-bluestore_osds_non_container'
@@ -333,6 +331,25 @@
                     current-parameters: true
                   - name: 'ceph-ansible-prs-luminous-filestore_osds_non_container'
                     current-parameters: true
+      - conditional-step:
+          condition-kind: shell
+          condition-command: |
+            #!/bin/bash
+            set -x
+            # if the target branch is not master or stable-3.2 then we DON'T RUN these tests
+            if [[ "$ghprbTargetBranch" =~ stable-3.[0-1] ]]; then
+              exit 1
+            fi
+            git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -E 'roles/ceph-defaults/tasks/facts.yml|roles/ceph-osd|ceph-validate'
+          on-evaluation-failure: dont-run
+          steps:
+            - multijob:
+                name: 'ceph-ansible osd scenarios playbook testing'
+                condition: SUCCESSFUL
+                execution-type: PARALLEL
+                projects:
+                  - name: 'ceph-ansible-prs-luminous-bluestore_lvm_osds'
+                    current-parameters: true
       - conditional-step:
           condition-kind: shell
           condition-command: |