ceph-ansible-pipeline: reduce pipeline workload

We now play the OSD scenarios only when
roles/ceph-defaults/tasks/facts.yml|roles/ceph-osd|ceph-validate are
touched.

Signed-off-by: Sébastien Han <seb@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 c75cd039c81bc68843dd5725f5f76ff0eb26b21c..d94b3e3ba83a98076539632bc0991c865d69b45a 100644 (file)
--- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
+++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
@@ -148,24 +148,11 @@
           condition-command: |
             #!/bin/bash
             set -x
-            git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -v 'infrastructure-playbooks'
-            if [ $? -eq 1 ]; then
-              echo "Infra playbooks modified.  Not testing remaining scenarios."
-              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 basic cluster testing phase'
-                condition: SUCCESSFUL
-                execution-type: PARALLEL
-                projects:
-                  - name: 'ceph-ansible-prs-luminous-centos7_cluster'
-                    current-parameters: true
-                  - name: 'ceph-ansible-prs-luminous-docker_cluster'
-                    current-parameters: true
-            - multijob:
-                name: 'ceph-ansible advanced cluster testing phase'
+                name: 'ceph-ansible osd scenarios playbook testing'
                 condition: SUCCESSFUL
                 execution-type: PARALLEL
                 projects:
@@ -175,17 +162,38 @@
                     current-parameters: true
                   - name: 'ceph-ansible-prs-luminous-bluestore_osds_non_container'
                     current-parameters: true
-                  - name: 'ceph-ansible-prs-luminous-docker_cluster_collocation'
-                    current-parameters: true
                   - name: 'ceph-ansible-prs-luminous-filestore_osds_container'
                     current-parameters: true
                   - name: 'ceph-ansible-prs-luminous-filestore_osds_non_container'
                     current-parameters: true
                   - name: 'ceph-ansible-prs-luminous-lvm_osds'
                     current-parameters: true
+
+      - conditional-step:
+          condition-kind: shell
+          condition-command: |
+            #!/bin/bash
+            set -x
+            git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -v 'infrastructure-playbooks'
+            if [ $? -eq 1 ]; then
+              echo "Infra playbooks modified.  Not testing remaining scenarios."
+              exit 1
+            fi
+          on-evaluation-failure: dont-run
+          steps:
+            - multijob:
+                name: 'ceph-ansible basic cluster testing phase'
+                condition: SUCCESSFUL
+                execution-type: PARALLEL
+                projects:
+                  - name: 'ceph-ansible-prs-luminous-centos7_cluster'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-luminous-docker_cluster'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-luminous-docker_cluster_collocation'
+                    current-parameters: true
                   - name: 'ceph-ansible-prs-luminous-ooo_collocation'
                     current-parameters: true
-
     scm:
       - git:
           url: https://github.com/ceph/ceph-ansible.git