From 38b9f979b4e56d0d1b47b96f928ca0359db3c840 Mon Sep 17 00:00:00 2001
From: Andrew Schoen <aschoen@redhat.com>
Date: Mon, 29 Aug 2016 10:31:25 -0500
Subject: [PATCH] adds support for dynamic DISTROS and ARCHS

We will now be able to define with distros and archs we
wish to build for.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---
 ceph-build/config/definitions/ceph-build.yml | 24 ++++++++++++++------
 ceph/config/definitions/ceph.yml             | 10 ++++++++
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index d759bbfc..4f7d09a2 100644
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-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==AVAILABLE_ARCH && (ARCH=="x86_64" || (ARCH == "arm64" && (DIST == "xenial" || DIST == "centos7")))
     axes:
       - axis:
           type: label-expression
@@ -18,21 +18,31 @@
             - huge
       - axis:
           type: label-expression
-          name: ARCH
+          name: AVAILABLE_ARCH
           values:
             - x86_64
             - arm64
       - axis:
           type: label-expression
-          name: DIST
+          name: AVAILABLE_DIST
           values:
-            - jessie
-            #- wheezy
-            #- precise
             - trusty
             - xenial
-            #- centos6
             - centos7
+            - jessie
+            - precise
+            - centos6
+            - wheezy
+      - axis:
+          type: dynamic
+          name: DIST
+          values:
+            - DISTROS
+      - axis:
+          type: dynamic
+          name: ARCH
+          values:
+            - ARCHS
 
     builders:
       - shell: |
diff --git a/ceph/config/definitions/ceph.yml b/ceph/config/definitions/ceph.yml
index 015393f0..dec838ab 100644
--- a/ceph/config/definitions/ceph.yml
+++ b/ceph/config/definitions/ceph.yml
@@ -69,6 +69,16 @@ Defaults to un-checked"
           description: "Base parent path for virtualenv locations, set to avoid issues with extremely long paths that are incompatible with tools like pip. Defaults to '/tmp/' (note the trailing slash, which is required)."
           default: "/tmp/"
 
+      - string:
+          name: DISTROS
+          description: "A list of distros to build for. Available options are: xenial, centos7, centos6, trusty, precise, wheezy, and jessie"
+          default: "xenial centos7"
+
+      - string:
+          name: ARCHS
+          description: "A list of architectures to build for. Available options are: x86_64, and arm64"
+          default: "x86_64"
+
     builders:
       - multijob:
           name: 'ceph tag phase'
-- 
2.39.5