From: Rishabh Dave Date: Mon, 8 Apr 2019 08:44:28 +0000 (+0530) Subject: ceph-ansible: add add_rbdmirrors scenario to CI X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=06610fbc4660da7efcee83e5df826fa035faef21;p=ceph-build.git ceph-ansible: add add_rbdmirrors scenario to CI Add add_rbdmirrors scenario to CI so that it can be tested against master. Signed-off-by: Rishabh Dave --- diff --git a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml index 289e1855..c64fb474 100644 --- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml +++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml @@ -356,6 +356,47 @@ current-parameters: true - name: 'ceph-ansible-prs-nautilus-centos-container-add_rgws' 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-rbdmirrors' + on-evaluation-failure: dont-run + steps: + - multijob: + name: 'ceph-ansible add_rbdmirrors playbook testing' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: 'ceph-ansible-prs-dev-centos-non_container-add_rbdmirrors' + current-parameters: true + - name: 'ceph-ansible-prs-dev-centos-container-add_rbdmirrors' + 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-rbdmirrors' + on-evaluation-failure: dont-run + steps: + - multijob: + name: 'ceph-ansible add_rbdmirrors playbook testing' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: 'ceph-ansible-prs-nautilus-centos-non_container-add_rbdmirrors' + current-parameters: true + - name: 'ceph-ansible-prs-nautilus-centos-container-add_rbdmirrors' - 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 8d2ab16b..e631bbb1 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 @@ - add_mons - add_mdss - add_rgws + - add_rbdmirrors - rgw_multisite - purge - lvm_auto_discovery @@ -97,6 +98,7 @@ - add_mons - add_mdss - add_rgws + - add_rbdmirrors - rgw_multisite - purge - lvm_auto_discovery