From ba7b0650c0ebf8354b1fa86700efe057cac2d4b2 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Tue, 17 Mar 2020 17:07:34 -0400 Subject: [PATCH] ceph*build: Update combination filter for bionic/centos8 ARM64 Signed-off-by: David Galloway --- ceph-build/config/definitions/ceph-build.yml | 2 +- ceph-dev-build/config/definitions/ceph-dev-build.yml | 2 +- ceph-dev-new-build/config/definitions/ceph-dev-new-build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml index c0a6af23..45bd087a 100644 --- a/ceph-build/config/definitions/ceph-build.yml +++ b/ceph-build/config/definitions/ceph-build.yml @@ -12,7 +12,7 @@ execution-strategy: combination-filter: | DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH && - (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "centos7"].contains(DIST))) + (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "bionic", "centos7", "centos8"].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 85025db6..1beafba1 100644 --- a/ceph-dev-build/config/definitions/ceph-dev-build.yml +++ b/ceph-dev-build/config/definitions/ceph-dev-build.yml @@ -27,7 +27,7 @@ execution-strategy: combination-filter: | DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH && - (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "centos7"].contains(DIST))) + (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "bionic", "centos7", "centos8"].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 bd340556..528a9610 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 @@ -27,7 +27,7 @@ execution-strategy: combination-filter: | DIST == AVAILABLE_DIST && ARCH == AVAILABLE_ARCH && - (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "centos7", "centos8"].contains(DIST))) + (ARCH == "x86_64" || (ARCH == "arm64" && ["xenial", "bionic", "centos7", "centos8"].contains(DIST))) axes: - axis: type: label-expression -- 2.39.5