From d7cc568c49623dc1a400ea68e3360995340425fa Mon Sep 17 00:00:00 2001
From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Mon, 12 Nov 2018 13:36:06 +0100
Subject: [PATCH] ceph-ansible: fix pipeline on add-osds/rgw-multisite
 scenarios

add-osds and rgw-multisite scenarios were not working as expected
in the CI regarding the destination branch.

This commits fixes the scenarios that should be run accoding to the
destination branch.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---
 .../definitions/ceph-ansible-pipeline.yml      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
index 26da74ea..2880346d 100644
--- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
+++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml
@@ -57,12 +57,12 @@
           condition-command: |
             #!/bin/bash
             set -x
-            # if the target branch is stable-3.2 we RUN these tests.
-            if [[ "$ghprbTargetBranch" == "master" ]]; then
+            # 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 'infrastructure-playbooks/add-osd|tests/functional/centos/7/add-osds'
-          on-evaluation-failure: run
+          on-evaluation-failure: dont-run
           steps:
             - multijob:
                 name: 'ceph-ansible add_osds playbook testing'
@@ -79,11 +79,11 @@
             #!/bin/bash
             set -x
             # if the target branch is stable-3.2 we RUN these tests.
-            if [[ "$ghprbTargetBranch" == "stable-3.2" ]]; then
+            if [[ "$ghprbTargetBranch" =~ stable-3.[0-1]|master ]]; then
               exit 1
             fi
             git diff --name-only $(git show HEAD | grep Merge | head -n 1 | cut -d ':' -f2) | grep -E 'infrastructure-playbooks/add-osd|tests/functional/centos/7/add-osds'
-          on-evaluation-failure: run
+          on-evaluation-failure: dont-run
           steps:
             - multijob:
                 name: 'ceph-ansible add_osds playbook testing'
@@ -368,11 +368,11 @@
             #!/bin/bash
             set -x
             # if the target branch is stable-3.2 then we RUN these tests.
-            if [[ "$ghprbTargetBranch" == "stable-3.2" ]]; then
+            if [[ "$ghprbTargetBranch" =~ stable-3.[0-1]|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'
-          on-evaluation-failure: run
+          on-evaluation-failure: dont-run
           steps:
             - multijob:
                 name: 'ceph-ansible rgw multisite scenarios playbook testing'
@@ -389,11 +389,11 @@
             #!/bin/bash
             set -x
             # if the target branch is master then we RUN these tests.
-            if [[ "$ghprbTargetBranch" == "master" ]]; then
+            if [[ "$ghprbTargetBranch" =~ "stable-" ]]; 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'
-          on-evaluation-failure: run
+          on-evaluation-failure: dont-run
           steps:
             - multijob:
                 name: 'ceph-ansible rgw multisite scenarios playbook testing'
-- 
2.39.5