]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-ansible-pipeline: fix luminous-bluestore_lvm_osds scenario
authorGuillaume Abrioux <gabrioux@redhat.com>
Fri, 16 Nov 2018 08:12:22 +0000 (09:12 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Fri, 16 Nov 2018 08:17:34 +0000 (09:17 +0100)
this scenario should run on stable-3.2 only

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml

index 9182a75f82970f967b40c1932bd1aedd3352ddf9..e22777e9bafc6b7ad7034a9c91a2f1a44238bb8b 100644 (file)
           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'
                 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: |