From 5dd68ed48e6a19adbb05cc011e2262aa434acd6a Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Fri, 16 Nov 2018 09:12:22 +0100 Subject: [PATCH] ceph-ansible-pipeline: fix luminous-bluestore_lvm_osds scenario this scenario should run on stable-3.2 only Signed-off-by: Guillaume Abrioux --- .../config/definitions/ceph-ansible-pipeline.yml | 6 ++++-- 1 file changed, 4 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 9182a75f..e22777e9 100644 --- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml +++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml @@ -336,8 +336,8 @@ condition-command: | #!/bin/bash set -x - # if the target branch is not master or stable-3.2 then we DON'T RUN these tests - if [[ "$ghprbTargetBranch" =~ stable-3.[0-1] ]]; then + # if the target branch is not stable-3.2 then we DON'T RUN these tests + 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-defaults/tasks/facts.yml|roles/ceph-osd|ceph-validate' @@ -350,6 +350,8 @@ projects: - name: 'ceph-ansible-prs-luminous-bluestore_lvm_osds' current-parameters: true + - name: 'ceph-ansible-prs-luminous-bluestore_lvm_osds_container' + current-parameters: true - conditional-step: condition-kind: shell condition-command: | -- 2.39.5