From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 2 Sep 2015 11:51:43 +0000 (-0400)
Subject: ceph-release-rpm: normalize on DIST and ARCH
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d01b8359ae447fe8a3d6169527bd1f54a8db0cd;p=ceph-build.git

ceph-release-rpm: normalize on DIST and ARCH

Remove sles11 and no longer relevant combination filter

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

diff --git a/ceph-release-rpm/config/definitions/ceph-release-rpm.yml b/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
index 5890cac4..55e9ce49 100644
--- a/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
+++ b/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
@@ -8,9 +8,6 @@
     block-downstream: false
     block-upstream: false
 
-    execution-strategy:
-      combination-filter: Arch=="x86_64"
-
     parameters:
       - string:
           name: RELEASE
@@ -19,19 +16,17 @@
     axes:
       - axis:
           type: label-expression
-          name: Arch
+          name: ARCH
           values:
             - x86_64
-            - i386
-            - arm7l
+
       - axis:
           type: label-expression
-          name: label_exp
+          name: DIST
           values:
             - centos6.5
             - centos7
             - rhel6.5
-            - sles11sp2
             - rhel7
 
     builders: