Revert "filter out trusty-pbuilder for centos7 and centos6"

This reverts commit 566263e6baada5544343dece3c30093bde36f3d1.

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 100309c69b91842f20fecb5a7d2f787a7aeb223f..df734e1576a1e7cef998f92f0d1d182138c2f074 100644 (file)
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -9,7 +9,7 @@
       - github:
           url: https://github.com/ceph/ceph
     execution-strategy:
-      combination-filter: '(GENERIC_BUILDER=="trusty-pbuilder" && (DIST == ("xenial"||"trusty"||"wheezy"||"jessie")) && ARCH=="x86_64") || (ARCH == "arm64" && (DIST == "xenial" || DIST == "centos7"))'
+      combination-filter: ARCH=="x86_64" || (ARCH == "arm64" && (DIST == "xenial" || DIST == "centos7"))
     axes:
       - axis:
           type: label-expression