From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 4 Dec 2018 09:26:17 +0000 (+0100)
Subject: ceph-ansible-pipeline: update pipeline
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1215%2Fhead;p=ceph-build.git

ceph-ansible-pipeline: update pipeline

- Reintroduce the purge_cluster_non_container and purge_cluster_container
scenario for stable-3.2 and master (somehow they got removed...),
- Remove purge_lvm_osds_* scenarios.

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 aea14a5ad..6329eabf8 100644
--- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
+++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
@@ -99,8 +99,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 stable-3.2 or master 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 'infrastructure-playbooks/purge'
@@ -121,8 +121,6 @@
                     current-parameters: true
                   - name: 'ceph-ansible-prs-luminous-purge_filestore_osds_non_container'
                     current-parameters: true
-                  - name: 'ceph-ansible-prs-dev-purge_lvm_osds'
-                    current-parameters: true
       - conditional-step:
           condition-kind: shell
           condition-command: |
@@ -140,7 +138,7 @@
                 condition: SUCCESSFUL
                 execution-type: PARALLEL
                 projects:
-                  - name: 'ceph-ansible-prs-dev-purge_lvm_osds_container'
+                  - name: 'ceph-ansible-prs-dev-purge_cluster_container'
                     current-parameters: true
       - conditional-step:
           condition-kind: shell
@@ -159,7 +157,45 @@
                 condition: SUCCESSFUL
                 execution-type: PARALLEL
                 projects:
-                  - name: 'ceph-ansible-prs-dev-purge_lvm_osds'
+                  - name: 'ceph-ansible-prs-dev-purge_cluster_non_container'
+                    current-parameters: true
+      - conditional-step:
+          condition-kind: shell
+          condition-command: |
+            #!/bin/bash
+            set -x
+            # if the target 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-docker-cluster.yml'
+          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_cluster_container'
+                    current-parameters: true
+      - conditional-step:
+          condition-kind: shell
+          condition-command: |
+            #!/bin/bash
+            set -x
+            # if the target 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-cluster.yml'
+          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_cluster_non_container'
                     current-parameters: true
       - conditional-step:
           condition-kind: shell