ceph-volume-ansible-prs: adds the objectstore factor

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/ceph-volume-ansible-prs/build/build b/ceph-volume-ansible-prs/build/build
index 467be5feb231a070f04e617193005c003fa2c376..7ad2168397d6b0086b25630f9fd8e2c97b41c30c 100644 (file)
--- a/ceph-volume-ansible-prs/build/build
+++ b/ceph-volume-ansible-prs/build/build
@@ -46,4 +46,4 @@ install_python_packages "pkgs[@]"
 
 cd src/ceph-volume/ceph_volume/tests/functional
 
-CEPH_DEV_BRANCH=$BRANCH CEPH_DEV_SHA1=$SHA $VENV/tox --workdir=$WORKDIR -vre $DISTRO-$SCENARIO -- --provider=libvirt
+CEPH_DEV_BRANCH=$BRANCH CEPH_DEV_SHA1=$SHA $VENV/tox --workdir=$WORKDIR -vre $DISTRO-$OBJECTSTORE-$SCENARIO -- --provider=libvirt

diff --git a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
index 744e30dc8c818f502d085a0ff11e092a63efd1b4..c0783d968cf2ae261245437b7d1bd5d2e7db235a 100644 (file)
--- a/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
+++ b/ceph-volume-ansible-prs/config/definitions/ceph-volume-pr.yml
@@ -3,18 +3,20 @@
     distro:
       - xenial
       - centos7
+    objectstore:
+      - bluestore
+      - filestore
     scenario:
       - create
       - prepare_activate
-      - bluestore
 
     jobs:
-      - 'ceph-volume-prs-{distro}-{scenario}'
+      - 'ceph-volume-prs-{distro}-{objectstore}-{scenario}'
 
 
 - job-template:
-    name: 'ceph-volume-prs-{distro}-{scenario}'
-    display-name: 'ceph-volume: Pull Request [{distro}-{scenario}]'
+    name: 'ceph-volume-prs-{distro}-{objectstore}-{scenario}'
+    display-name: 'ceph-volume: Pull Request [{distro}-{objectstore}-{scenario}]'
     node: vagrant&&libvirt
     concurrent: true
     project-type: freestyle
@@ -41,14 +43,14 @@
           org-list:
             - ceph
           only-trigger-phrase: true
-          trigger-phrase: 'jenkins test ceph-volume {distro}-{scenario}'
+          trigger-phrase: 'jenkins test ceph-volume {distro}-{objectstore}-{scenario}'
           github-hooks: true
           permit-all: true
           auto-close-on-fail: false
-          status-context: "ceph-volume testing {distro}-{scenario}"
-          started-status: "ceph-volume running {distro}-{scenario}"
-          success-status: "ceph-volume {distro}-{scenario} OK"
-          failure-status: "ceph-volume {distro}-{scenario} failed"
+          status-context: "ceph-volume testing {distro}-{objectstore}-{scenario}"
+          started-status: "ceph-volume running {distro}-{objectstore}-{scenario}"
+          success-status: "ceph-volume {distro}-{objectstore}-{scenario} OK"
+          failure-status: "ceph-volume {distro}-{objectstore}-{scenario} failed"
 
     scm:
       - git:
@@ -66,6 +68,7 @@
           properties-content: |
             SCENARIO={scenario}
             DISTRO={distro}
+            OBJECTSTORE={objectstore}
       - shell:
           !include-raw-escape:
             - ../../../scripts/build_utils.sh