From: Sébastien Han <seb@redhat.com>
Date: Fri, 12 Oct 2018 18:18:16 +0000 (+0200)
Subject: ceph-ansible-pipeline osd followup
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1160%2Fhead;p=ceph-build.git

ceph-ansible-pipeline osd followup

Not sure what's going on, this is mostly a commit to debug

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 5f4aa3ee..c3e7a4c2 100644
--- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
+++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
@@ -238,7 +238,12 @@
               exit 1
             fi
             # do not run if roles/ceph-osd has been touched since the task above play osds already
-            git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -E 'roles/ceph-osd' && exit 1
+            git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -E 'roles/ceph-osd'
+            if [ $? -eq 1 ]; then
+              echo "ceph-osd role modified, nothing to test, the ceph-osd role test is handled by another pipeline job."
+              exit 1
+            fi
+            exit 0
           on-evaluation-failure: dont-run
           steps:
             - multijob: