From d6200c7d6fa0dac39bf43d18791ea74ffff3a514 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Wed, 26 Jun 2019 14:03:07 +0530 Subject: [PATCH] ceph-ansible: add shrink_rgw scenario test to CI Add shrink_rgw 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 | 3 ++ 2 files changed, 45 insertions(+) diff --git a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml index ba29197d..ba398e41 100644 --- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml +++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml @@ -739,6 +739,48 @@ current-parameters: true - name: 'ceph-ansible-prs-nautilus-centos-container-shrink_rbdmirror' current-parameters: true + - conditional-step: + condition-kind: shell + condition-command: | + #!/bin/bash + set -x + # if the target branch is not master then we DON'T RUN these tests. + if [[ "$ghprbTargetBranch" != "master" ]]; then + exit 1 + fi + git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep 'infrastructure-playbooks/shrink-rgw' + on-evaluation-failure: dont-run + steps: + - multijob: + name: 'ceph-ansible shrink_rgw playbook testing' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: 'ceph-ansible-prs-dev-centos-non_container-shrink_rgw' + current-parameters: true + - name: 'ceph-ansible-prs-dev-centos-container-shrink_rgw' + current-parameters: true + - conditional-step: + condition-kind: shell + condition-command: | + #!/bin/bash + set -x + # if the target branch is not stable-4.0 then we DON'T RUN these tests. + if [[ "$ghprbTargetBranch" != "stable-4.0" ]]; then + exit 1 + fi + git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep 'infrastructure-playbooks/shrink-rgw' + on-evaluation-failure: dont-run + steps: + - multijob: + name: 'ceph-ansible shrink_rgw playbook testing' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: 'ceph-ansible-prs-nautilus-centos-non_container-shrink_rgw' + current-parameters: true + - name: 'ceph-ansible-prs-nautilus-centos-container-shrink_rgw' + 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 dae27785..cf81ed59 100644 --- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml +++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml @@ -20,6 +20,7 @@ - shrink_mgr - shrink_mds - shrink_rbdmirror + - shrink_rgw - lvm_batch - add_osds - add_mons @@ -101,6 +102,7 @@ - shrink_mgr - shrink_mds - shrink_rbdmirror + - shrink_rgw - lvm_batch - add_osds - add_mons @@ -183,6 +185,7 @@ - shrink_mgr - shrink_mds - shrink_rbdmirror + - shrink_rgw - lvm_batch - add_osds - rgw_multisite -- 2.39.5