From: Andrew Schoen <aschoen@redhat.com>
Date: Wed, 30 Mar 2016 17:06:13 +0000 (-0500)
Subject: ceph-ansible-pull-requests: support for trusty and centos7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd7018ace48e3be4cfa35f9dac48fd4fdf7d5ea2;p=ceph-build.git

ceph-ansible-pull-requests: support for trusty and centos7

These tests will now run against both trusty and centos7 nodes.

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

diff --git a/ceph-ansible-pull-requests/config/definitions/ceph-ansible-pull-requests.yml b/ceph-ansible-pull-requests/config/definitions/ceph-ansible-pull-requests.yml
index 1ba03306..9982f503 100644
--- a/ceph-ansible-pull-requests/config/definitions/ceph-ansible-pull-requests.yml
+++ b/ceph-ansible-pull-requests/config/definitions/ceph-ansible-pull-requests.yml
@@ -14,8 +14,7 @@
 
 - job:
     name: ceph-ansible-pull-requests
-    node: small && unique
-    project-type: freestyle
+    project-type: matrix
     defaults: global
     display-name: 'ceph-ansible: Pull Requests'
     quiet-period: 5
@@ -25,6 +24,23 @@
     properties:
       - github:
           url: https://github.com/ceph/ceph-ansible
+    axes:
+      - axis:
+          type: label-expression
+          name: MACHINE_SIZE
+          values:
+            - small
+      - axis:
+          type: label-expression
+          name: UNIQUE
+          values:
+            - unique
+      - axis:
+          type: label-expression
+          name: DIST
+          values:
+            - trusty
+            - centos7
     logrotate:
       daysToKeep: 15
       numToKeep: 30