From 677def011a458c71d69b83e3683d7de5428bac4f Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Mon, 11 Feb 2019 13:09:28 +0530 Subject: [PATCH] add add_mons scenario to CI Add add_mons scenario to CI so that it can be tested against master. Signed-off-by: Rishabh Dave --- .../definitions/ceph-ansible-pipeline.yml | 21 +++++++++++++++++++ .../config/definitions/ceph-ansible-prs.yml | 1 + 2 files changed, 22 insertions(+) diff --git a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml index 212aea8f..f4252ce1 100644 --- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml +++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml @@ -94,6 +94,27 @@ current-parameters: true - name: 'ceph-ansible-prs-luminous-centos-container-add_osds' current-parameters: true + - conditional-step: + condition-kind: shell + condition-command: | + #!/bin/bash + set -x + # if the target branch is master we RUN these tests. + if [[ "$ghprbTargetBranch" =~ "stable-" ]]; then + exit 1 + fi + git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -E 'infrastructure-playbooks/add-mon|tests/functional/add-mons' + on-evaluation-failure: dont-run + steps: + - multijob: + name: 'ceph-ansible add_mons playbook testing' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: 'ceph-ansible-prs-dev-centos-non_container-add_mons' + current-parameters: true + - name: 'ceph-ansible-prs-dev-centos-container-add_mons' + current-parameters: true - conditional-step: condition-kind: shell condition-command: | diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml index a2b34575..eed0c278 100644 --- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml +++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml @@ -23,6 +23,7 @@ - shrink_osd - lvm_batch - add_osds + - add_mons - rgw_multisite - purge - lvm_auto_discovery -- 2.39.5