From 8c19fb60e26272e706c09ac5222119947d3054f4 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Mon, 8 Apr 2019 13:42:09 +0530 Subject: [PATCH] add add_rgws scenario to CI Add add_rgws scenario to CI so that it can be tested against master. 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 f7c9313e..289e1855 100644 --- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml +++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml @@ -314,6 +314,48 @@ current-parameters: true - name: 'ceph-ansible-prs-dev-centos-container-add_mdss' 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-rgws' + on-evaluation-failure: dont-run + steps: + - multijob: + name: 'ceph-ansible add_rgws playbook testing' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: 'ceph-ansible-prs-dev-centos-non_container-add_rgws' + current-parameters: true + - name: 'ceph-ansible-prs-dev-centos-container-add_rgws' + 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-rgws' + on-evaluation-failure: dont-run + steps: + - multijob: + name: 'ceph-ansible add_rgws playbook testing' + condition: SUCCESSFUL + execution-type: PARALLEL + projects: + - name: 'ceph-ansible-prs-nautilus-centos-non_container-add_rgws' + current-parameters: true + - name: 'ceph-ansible-prs-nautilus-centos-container-add_rgws' + 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 64965006..8d2ab16b 100644 --- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml +++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml @@ -22,6 +22,7 @@ - add_osds - add_mons - add_mdss + - add_rgws - rgw_multisite - purge - lvm_auto_discovery @@ -95,6 +96,7 @@ - add_osds - add_mons - add_mdss + - add_rgws - rgw_multisite - purge - lvm_auto_discovery -- 2.39.5