From 1705b88ccd70ff8de5226c31aeb53a8ebbdd2aa9 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Thu, 2 May 2019 18:54:22 +0530 Subject: [PATCH] ceph-ansible: add add_mgrs scenario to CI Add add_mgrs scenario to CI so that it can be tested against master and nautilus. Signed-off-by: Rishabh Dave --- .../definitions/ceph-ansible-pipeline.yml | 42 +++++++++++++++++++ .../config/definitions/ceph-ansible-prs.yml | 2 + 2 files changed, 44 insertions(+) diff --git a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml index c64fb474..5cfd3dd3 100644 --- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml +++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml @@ -293,6 +293,48 @@ current-parameters: true - name: 'ceph-ansible-prs-nautilus-centos-container-add_mons' 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 'tests/functional/add-mgrs' + on-evaluation-failure: dont-run + steps: + - multijob: + name: 'ceph-ansible add_mgrs playbook testing' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: 'ceph-ansible-prs-dev-centos-non_container-add_mgrs' + current-parameters: true + - name: 'ceph-ansible-prs-dev-centos-container-add_mgrs' + current-parameters: true + - conditional-step: + condition-kind: shell + condition-command: | + #!/bin/bash + set -x + # if the target branch is stable-4.0 we RUN these tests. + if [[ "$ghprbTargetBranch" =~ stable-3.[0-2]|master ]]; then + exit 1 + fi + git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -E 'tests/functional/add-mgrs' + on-evaluation-failure: dont-run + steps: + - multijob: + name: 'ceph-ansible add_mgrs playbook testing' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: 'ceph-ansible-prs-nautilus-centos-non_container-add_mgrs' + current-parameters: true + - name: 'ceph-ansible-prs-nautilus-centos-container-add_mgrs' + 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 e631bbb1..2713385f 100644 --- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml +++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml @@ -21,6 +21,7 @@ - lvm_batch - add_osds - add_mons + - add_mgrs - add_mdss - add_rgws - add_rbdmirrors @@ -96,6 +97,7 @@ - lvm_batch - add_osds - add_mons + - add_mgrs - add_mdss - add_rgws - add_rbdmirrors -- 2.39.5