ceph-ansible: Just pass LVM scenarios if the branch is stable-3.0

Signed-off-by: David Galloway <dgallowa@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 fabfbedc4ed00cb460c442f71674027e031d8f8b..ff2d45c6402a754336ab3dfc1805d385cf5e10dc 100644 (file)
--- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
+++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
@@ -60,56 +60,23 @@
             git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep 'infrastructure-playbooks/purge'
           on-evaluation-failure: dont-run
           steps:
-            # If PR is merging into stable-3.0 branch HEAD, run all but LVM scenarios
-            - conditional-step:
-                condition-kind: shell
-                condition-command: |
-                  #!/bin/bash
-                  set -x
-                  git show-branch ${sha1} | grep $(git ls-remote https://github.com/ceph/ceph-ansible.git stable-3.0 | awk '{ print $1 }')
-                on-evaluation-failure: dont-run
-                steps:
-                  - multijob:
-                      name: 'ceph-ansible purge playbook testing (stable-3.0)'
-                      condition: SUCCESSFUL
-                      execution-type: PARALLEL
-                      projects:
-                        - name: 'ceph-ansible-prs-luminous-purge_bluestore_osds_non_container'
-                          current-parameters: true
-                        - name: 'ceph-ansible-prs-luminous-purge_cluster_container'
-                          current-parameters: true
-                        - name: 'ceph-ansible-prs-luminous-purge_cluster_non_container'
-                          current-parameters: true
-                        - name: 'ceph-ansible-prs-luminous-purge_filestore_osds_container'
-                          current-parameters: true
-                        - name: 'ceph-ansible-prs-luminous-purge_filestore_osds_non_container'
-                          current-parameters: true
-            # If PR is NOT merging into stable-3.0 branch HEAD, run all scenarios
-            - conditional-step:
-                condition-kind: shell
-                condition-command: |
-                  #!/bin/bash
-                  set -x
-                  git show-branch ${sha1} | grep -v $(git ls-remote https://github.com/ceph/ceph-ansible.git stable-3.0 | awk '{ print $1 }')
-                on-evaluation-failure: run
-                steps:
-                  - multijob:
-                      name: 'ceph-ansible purge playbook testing'
-                      condition: SUCCESSFUL
-                      execution-type: PARALLEL
-                      projects:
-                        - name: 'ceph-ansible-prs-luminous-purge_bluestore_osds_non_container'
-                          current-parameters: true
-                        - name: 'ceph-ansible-prs-luminous-purge_cluster_container'
-                          current-parameters: true
-                        - name: 'ceph-ansible-prs-luminous-purge_cluster_non_container'
-                          current-parameters: true
-                        - name: 'ceph-ansible-prs-luminous-purge_filestore_osds_container'
-                          current-parameters: true
-                        - name: 'ceph-ansible-prs-luminous-purge_filestore_osds_non_container'
-                          current-parameters: true
-                        - name: 'ceph-ansible-prs-luminous-purge_lvm_osds'
-                          current-parameters: true
+            - multijob:
+                name: 'ceph-ansible purge playbook testing'
+                condition: SUCCESSFUL
+                execution-type: PARALLEL
+                projects:
+                  - name: 'ceph-ansible-prs-luminous-purge_bluestore_osds_non_container'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-luminous-purge_cluster_container'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-luminous-purge_cluster_non_container'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-luminous-purge_filestore_osds_container'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-luminous-purge_filestore_osds_non_container'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-luminous-purge_lvm_osds'
+                    current-parameters: true
       - conditional-step:
           condition-kind: shell
           condition-command: |
@@ -197,66 +164,29 @@
                     current-parameters: true
                   - name: 'ceph-ansible-prs-luminous-docker_cluster'
                     current-parameters: true
-            # If PR is merging into stable-3.0 branch HEAD, run all but LVM scenarios
-            - conditional-step:
-                condition-kind: shell
-                condition-command: |
-                  #!/bin/bash
-                  set -x
-                  git show-branch ${sha1} | grep $(git ls-remote https://github.com/ceph/ceph-ansible.git stable-3.0 | awk '{ print $1 }')
-                on-evaluation-failure: dont-run
-                steps:
-                  - multijob:
-                      name: 'ceph-ansible advanced cluster testing phase (stable-3.0)'
-                      condition: SUCCESSFUL
-                      execution-type: PARALLEL
-                      projects:
-                        - name: 'ceph-ansible-prs-luminous-bluestore_osds_container'
-                          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-ooo_collocation'
-                          current-parameters: true
-                        - name: 'ceph-ansible-prs-luminous-xenial_cluster'
-                          current-parameters: true
-            # If PR is NOT merging into stable-3.0 branch HEAD, run all scenarios
-            - conditional-step:
-                condition-kind: shell
-                condition-command: |
-                  #!/bin/bash
-                  set -x
-                  git show-branch ${sha1} | grep -v $(git ls-remote https://github.com/ceph/ceph-ansible.git stable-3.0 | awk '{ print $1 }')
-                on-evaluation-failure: run
-                steps:
-                  - multijob:
-                      name: 'ceph-ansible advanced cluster testing phase'
-                      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'
-                          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
-                        - name: 'ceph-ansible-prs-luminous-ooo_collocation'
-                          current-parameters: true
-                        - name: 'ceph-ansible-prs-luminous-xenial_cluster'
-                          current-parameters: true
+            - multijob:
+                name: 'ceph-ansible advanced cluster testing phase'
+                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'
+                    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
+                  - name: 'ceph-ansible-prs-luminous-ooo_collocation'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-luminous-xenial_cluster'
+                    current-parameters: true
 
     scm:
       - git:

diff --git a/ceph-ansible-prs/build/build b/ceph-ansible-prs/build/build
index fdcff5aa5d2ff8ade26398a02b63de993b5a38b8..0177717e993958dd42d69c5d75c3a498a52f110a 100644 (file)
--- a/ceph-ansible-prs/build/build
+++ b/ceph-ansible-prs/build/build
@@ -26,4 +26,7 @@ for scenario in $scenarios; do
 done
 popd
 
-start_tox
+# stable-3.0 doesn't have ceph-volume and therefore doesn't support LVM scenarios.
+# Rather than running a bunch of conditional steps in the pipeline to check if
+# a PR is merging into the stable-3.0 branch, we'll just pass LVM jobs.
+[[ "$ghprbTargetBranch" == "stable-3.0" && "$scenario" == *"lvm"* ]] || start_tox