ceph-docker-prs: add more tests for osd scenarios and luminous

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

diff --git a/ceph-docker-prs/config/definitions/ceph-docker-prs.yml b/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
index b1f21375d37cb9413337639baf219b530bf77f48..44dbac050927e635d9eaf68b94d119a31b0c1524 100644 (file)
--- a/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
+++ b/ceph-docker-prs/config/definitions/ceph-docker-prs.yml
@@ -1,20 +1,26 @@
 - project:
     name: ceph-docker-prs
-    scenario:
-      - ceph_ansible-jewel-centos7-cluster
-      - ceph_ansible-jewel-xenial-cluster
-      - ceph_ansible-kraken-centos7-cluster
-      - ceph_ansible-kraken-xenial-cluster
+    os:
+      - centos7
+      - xenial
+    ceph-version:
+      - jewel
+      - kraken
+      - luminous
+    test:
+      - cluster
+      - dedicated_journal
+      - dmcrypt_journal_collocation
     jobs:
-        - 'ceph-docker-prs-{scenario}'
+        - 'ceph-docker-prs-ceph_ansible-{ceph-version}-{os}-{test}'
 
 
 - job-template:
-    name: 'ceph-docker-prs-{scenario}'
+    name: 'ceph-docker-prs-ceph_ansible-{ceph-version}-{os}-{test}'
     node: vagrant&&libvirt
     concurrent: true
     defaults: global
-    display-name: 'ceph-docker: Pull Requests [{scenario}]'
+    display-name: 'ceph-docker: Pull Requests [ceph_ansible-{ceph-version}-{os}-{test}]'
     quiet-period: 5
     block-downstream: false
     block-upstream: false
@@ -38,15 +44,15 @@
           allow-whitelist-orgs-as-admins: true
           org-list:
             - ceph
-          trigger-phrase: 'jenkins test {scenario}'
+          trigger-phrase: 'jenkins test ceph_ansible-{ceph-version}-{os}-{test}'
           only-trigger-phrase: false
           github-hooks: true
           permit-all: true
           auto-close-on-fail: false
-          status-context: "Testing: {scenario}"
-          started-status: "Running: {scenario}"
-          success-status: "OK - {scenario}"
-          failure-status: "FAIL - {scenario}"
+          status-context: "Testing: ceph_ansible-{ceph-version}-{os}-{test}"
+          started-status: "Running: ceph_ansible-{ceph-version}-{os}-{test}"
+          success-status: "OK - ceph_ansible-{ceph-version}-{os}-{test}"
+          failure-status: "FAIL - ceph_ansible-{ceph-version}-{os}-{test}"
 
     scm:
       - git:
@@ -62,7 +68,7 @@
     builders:
       - inject:
           properties-content: |
-            SCENARIO={scenario}
+            SCENARIO=ceph_ansible-{ceph-version}-{os}-{test}
       - shell:
           !include-raw-escape:
             - ../../../scripts/build_utils.sh