From 347efcd99041be5635de9a276c391123d0bc1539 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Sat, 6 Apr 2019 16:51:23 +0200 Subject: [PATCH] ceph-ansible-pipeline: rgw_multisite fixes for stable-4.0 These conditions were incorrect for stable-4.0 luminous jobs triggered for stable-4.0 Signed-off-by: Guillaume Abrioux --- .../config/definitions/ceph-ansible-pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml index 15510ca4..004ea842 100644 --- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml +++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml @@ -534,7 +534,7 @@ #!/bin/bash set -x # if the target branch is not stable-3.2 then we DON'T RUN these tests - if [[ "$ghprbTargetBranch" =~ stable-3.[0-1]|master ]]; then + if [[ "$ghprbTargetBranch" =~ stable-3.[0-1]|stable-4.0|master ]]; then exit 1 fi git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -E 'roles/ceph-defaults/tasks/facts.yml|roles/ceph-osd|ceph-validate' @@ -555,7 +555,7 @@ #!/bin/bash set -x # if the target branch is stable-3.2 then we RUN these tests. - if [[ "$ghprbTargetBranch" =~ stable-3.[0-1]|master ]]; then + if [[ "$ghprbTargetBranch" =~ stable-3.[0-1]|stable-4.0|master ]]; then exit 1 fi git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -E 'roles/ceph-rgw/tasks/multisite|tests/functional/centos/7/rgw-multisite' -- 2.39.5