From: Sébastien Han Date: Fri, 12 Oct 2018 17:42:36 +0000 (+0200) Subject: ceph-ansible-ci: do not run osd twice X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=040195e6ab6dc5cc00ce34d1959deca7bfaae411;p=ceph-build.git 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 --- diff --git a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml index 3979c4c5..5f4aa3ee 100644 --- 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: