From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 26 Apr 2016 12:57:06 +0000 (-0400)
Subject: Revert "filter out trusty-pbuilder for centos7 and centos6"
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5416e6cbf74fa9ce799810aa61d18599ea173b3;p=ceph-build.git

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 100309c6..df734e15 100644
--- 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