ceph-*-build: use more readable groovy expression

see http://groovy-lang.org/operators.html

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 4ce1e822dac521154fc4d4ca7368a55b5587ce0a..48c0d06df348606e9672ec0306da7efbaf8c86b7 100644 (file)
--- 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 e7bd308f82b4320ad46327e2a7fb4ed9135d0888..070779777949a291d7d524538da6efb117fae549 100644 (file)
--- 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 9dba5002791f45a49b4d380f2cd03d33cf4e060d..1cfaf332e171d789714bc1649ebe0f8961b27c1e 100644 (file)
--- 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