ceph-dev: gives the ability to select with architectures to build for

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 02da4e0e41cd0c48daa75b0b19f4199c57de184b..a6f6d83ac6a5148d6073e6858bc9113614c8eb84 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: DIST==AVAILABLE_DIST && (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,7 +18,7 @@
             - huge
       - axis:
           type: label-expression
-          name: ARCH
+          name: AVAILABLE_ARCH
           values:
             - x86_64
             - arm64
@@ -35,6 +35,11 @@
           name: DIST
           values:
             - DISTROS
+      - axis:
+          type: dynamic
+          name: ARCH
+          values:
+            - ARCHS
 
 
 

diff --git a/ceph-dev/config/definitions/ceph-dev.yml b/ceph-dev/config/definitions/ceph-dev.yml
index 43e9685304bd0ccf4b0d7371fae0d7da667c8365..6ac7701e1c26fbad6237e572e8be9855f6170f7f 100644 (file)
--- a/ceph-dev/config/definitions/ceph-dev.yml
+++ b/ceph-dev/config/definitions/ceph-dev.yml
@@ -27,6 +27,11 @@
           description: "A list of distros to build for. Available options are: xenial, centos7, trusty 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"
+
       - bool:
           name: THROWAWAY
           description: "