ceph-ansible-ci: do not run osd twice

Do not play twice osds if they have been ack by the first task of the
pipeline.

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 3979c4c5fe3a8849326bd87b6034de46f6dd2bce..5f4aa3ee769d9eaeac60df93b615cfd33c3d61b5 100644 (file)
--- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
+++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
@@ -237,6 +237,8 @@
               echo "Infra playbooks modified.  Not testing remaining scenarios."
               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
           on-evaluation-failure: dont-run
           steps:
             - multijob: