From: Sébastien Han <seb@redhat.com>
Date: Wed, 10 Oct 2018 16:36:12 +0000 (-0400)
Subject: ceph-ansible pipeline branch improvement
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1d2854db4c3e84e3fb127200d3bf9d133b5d3570;p=ceph-build.git

ceph-ansible pipeline branch improvement

The code is not ideal and might be hard to read but the rationales are
the following:

* master ceph-ansible has fully adopted ceph-volume and we are about to
remove ceph-disk too
* this means we can not and should not run ceph-disk tests on master BUT
only on stable 3.0 and 3.1 branches.

Only lvm scenarios should play on ceph-ansible master.

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 e6e6d162..52830201 100644
--- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
+++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
@@ -57,6 +57,10 @@
           condition-command: |
             #!/bin/bash
             set -x
+            # if the current branch is master then we don't run these tests
+            if [[ "$ghprbTargetBranch" == "master" ]]; then
+              exit 1
+            fi
             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:
@@ -77,6 +81,25 @@
                     current-parameters: true
                   - name: 'ceph-ansible-prs-luminous-purge_lvm_osds'
                     current-parameters: true
+      - conditional-step:
+          condition-kind: shell
+          condition-command: |
+            #!/bin/bash
+            set -x
+            # if the current branch is stable-3.0 or stable-3.1 then we don't run these tests
+            if [[ "$ghprbTargetBranch" == "stable-3.1" ]] || [[ "$ghprbTargetBranch" == "stable-3.0" ]]; then
+              exit 1
+            fi
+            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:
+            - multijob:
+                name: 'ceph-ansible purge playbook testing'
+                condition: SUCCESSFUL
+                execution-type: PARALLEL
+                projects:
+                  - name: 'ceph-ansible-prs-luminous-purge_lvm_osds'
+                    current-parameters: true
       - conditional-step:
           condition-kind: shell
           condition-command: |
@@ -148,6 +171,10 @@
           condition-command: |
             #!/bin/bash
             set -x
+            # if the current branch is master then we don't run these tests
+            if [[ "$ghprbTargetBranch" == "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'
           on-evaluation-failure: dont-run
           steps:
@@ -169,6 +196,37 @@
                   - name: 'ceph-ansible-prs-luminous-lvm_osds'
                     current-parameters: true
 
+      - conditional-step:
+          condition-kind: shell
+          condition-command: |
+            #!/bin/bash
+            set -x
+            # if the current branch is stable-3.0 or stable-3.1 then we don't run these tests
+            if [[ "$ghprbTargetBranch" == "stable-3.1" ]] || [[ "$ghprbTargetBranch" == "stable-3.0" ]]; 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-lvm_osds'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-luminous-lvm_osds_containers'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-luminous-bluestore_lvm_osds'
+                    current-parameters: true
+                  - name: 'ceph-ansible-prs-luminous-bluestore_lvm_osds_container'
+                    current-parameters: true
+                  #- name: 'ceph-ansible-prs-luminous-lvm_batch'
+                  #  current-parameters: true
+                  # lvm batch container is not supported at the moment, see https://tracker.ceph.com/issues/36363
+                  #- name: 'ceph-ansible-prs-luminous-lvm_batch_container'
+                  #  current-parameters: true
+
       - conditional-step:
           condition-kind: shell
           condition-command: |