From 46e723eea6ec11c1bf945cca65b843876efd1c1d Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 3 Aug 2016 17:30:23 -0500 Subject: [PATCH] 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 --- .../config/definitions/ceph-dev-build.yml | 16 ++++++++++------ ceph-dev/config/definitions/ceph-dev.yml | 5 +++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml index 2b7ca584..2a1265be 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: 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 c223958f..010dad91 100644 --- 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: " -- 2.39.5