ceph-dev: adds the ability to specify which distros to build for

This adds a DISTROS property that can be passed a space delimeted list
of labels that controls which distros will be included in the matrix.

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

diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml
index 2b7ca58424662b1e0a420c6eeff2f9d4a5d2f13e..2a1265be1eb0a2799699f2c658e3946a39c7e3ee 100644 (file)
--- a/ceph-dev-build/config/definitions/ceph-dev-build.yml
+++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml
@@ -9,7 +9,7 @@
       - github:
           url: https://github.com/ceph/ceph
     execution-strategy:
-      combination-filter: ARCH=="x86_64" || (ARCH == "arm64" && (DIST == "xenial" || DIST == "centos7"))
+       combination-filter: DIST==AVAILABLE_DIST && (ARCH=="x86_64" || (ARCH == "arm64" && (DIST == "xenial" || DIST == "centos7")))
     axes:
       - axis:
           type: label-expression
@@ -24,15 +24,19 @@
             - arm64
       - axis:
           type: label-expression
-          name: DIST
+          name: AVAILABLE_DIST
           values:
-            - jessie
-            #- wheezy
-            #- precise
             - trusty
             - xenial
-            #- centos6
             - centos7
+            - jessie
+      - axis:
+          type: dynamic
+          name: DIST
+          values:
+            - DISTROS
+
+
 
     builders:
       - shell: |

diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml
index c223958ff6600bbc80535cfc74f2af983d755f83..010dad91f51fb3e704902b1b4470279167d6d03a 100644 (file)
--- a/ceph-dev/config/definitions/ceph-dev.yml
+++ b/ceph-dev/config/definitions/ceph-dev.yml
@@ -21,6 +21,11 @@
           description: "The git branch (or tag) to build"
           default: master
 
+      - string:
+          name: DISTROS
+          description: "A list of distros to build for"
+          default: "xenial centos7"
+
       - bool:
           name: THROWAWAY
           description: "