From fe277417ffa57739a490c258d621035bd3f53b35 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 11 Aug 2016 11:16:02 -0500 Subject: [PATCH] ceph-dev: gives the ability to select with architectures to build for Signed-off-by: Andrew Schoen --- ceph-dev-build/config/definitions/ceph-dev-build.yml | 9 +++++++-- ceph-dev/config/definitions/ceph-dev.yml | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml index 02da4e0e..a6f6d83a 100644 --- 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 43e96853..6ac7701e 100644 --- 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: " -- 2.39.5