From 02734e4527aee64b7512da11b06510522f470c53 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 7 Dec 2017 02:42:18 +0800 Subject: [PATCH] ceph-*-build: use more readable groovy expression see http://groovy-lang.org/operators.html Signed-off-by: Kefu Chai --- ceph-build/config/definitions/ceph-build.yml | 4 +++- ceph-dev-build/config/definitions/ceph-dev-build.yml | 4 +++- ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml index 4ce1e822..48c0d06d 100644 --- a/ceph-build/config/definitions/ceph-build.yml +++ b/ceph-build/config/definitions/ceph-build.yml @@ -10,7 +10,9 @@ - github: url: https://github.com/ceph/ceph execution-strategy: - combination-filter: DIST==AVAILABLE_DIST && ARCH==AVAILABLE_ARCH && (ARCH=="x86_64" || (ARCH == "arm64" && (DIST == "xenial" || DIST == "centos7"))) + combination-filter: | + DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH && + (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "centos7"].contains(DIST))) axes: - axis: type: label-expression diff --git a/ceph-dev-build/config/definitions/ceph-dev-build.yml b/ceph-dev-build/config/definitions/ceph-dev-build.yml index e7bd308f..07077977 100644 --- a/ceph-dev-build/config/definitions/ceph-dev-build.yml +++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml @@ -11,7 +11,9 @@ - github: url: https://github.com/ceph/ceph execution-strategy: - combination-filter: DIST==AVAILABLE_DIST && ARCH==AVAILABLE_ARCH && (ARCH=="x86_64" || (ARCH == "arm64" && (DIST == "xenial" || DIST == "centos7"))) + combination-filter: | + DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH && + (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "centos7"].contains(DIST))) axes: - axis: type: label-expression diff --git a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml index 9dba5002..1cfaf332 100644 --- a/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml +++ b/ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml @@ -11,7 +11,9 @@ - github: url: https://github.com/ceph/ceph-ci execution-strategy: - combination-filter: DIST==AVAILABLE_DIST && ARCH==AVAILABLE_ARCH && (ARCH=="x86_64" || (ARCH == "arm64" && (DIST == "xenial" || DIST == "centos7"))) + combination-filter: | + DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH && + (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "centos7"].contains(DIST))) axes: - axis: type: label-expression -- 2.39.5