ceph-build: use DIST and ARCH, normalize values

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 10b2f1b6db97fcadd883d97c854e94913abc0b72..6596d8616fde2e5d4b2a45ec514f7c63354e8b3d 100644 (file)
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -11,23 +11,20 @@
       - github:
           url: https://github.com/ceph/ceph
 
-    execution-strategy:
-      combination-filter: Arch=="x86_64"
-
     axes:
       - axis:
           type: label-expression
-          name: Arch
+          name: ARCH
           values:
             - x86_64
       - axis:
           type: label-expression
-          name: Distro
+          name: DIST
           values:
-            - wheezy-pbuild
+            - wheezy
             - jessie
-            - precise-pbuild
-            - trusty-pbuild
+            - precise
+            - trusty
             - centos6.5
             - centos7
             - rhel6.5