From: Ken Dreyer <kdreyer@redhat.com>
Date: Tue, 5 May 2015 15:40:27 +0000 (-0600)
Subject: ceph-release-rpm: update EL6 references to "6.5"
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20b5a7e4f6917e41d32e4b3931224583d845a519;p=ceph-build.git

ceph-release-rpm: update EL6 references to "6.5"

This was an older job that didn't get updated often, so when we added
the "6.5" builders, this job was neglected.

Update all the "6.3" references to "6.5" so we can drop the old "6.3"
buildslaves. EL 6.5 has been EOL for a while now and is no longer
receiving security updates.
---

diff --git a/ceph-release-rpm/build/build b/ceph-release-rpm/build/build
index 2094d7fa3..dda227628 100644
--- a/ceph-release-rpm/build/build
+++ b/ceph-release-rpm/build/build
@@ -35,12 +35,12 @@ rm -rf RPMBUILD
 # What are we building ?
 
 target=$DIST
-if [ "$target" = "centos6.3" ] ; then target=el6 ; fi
+if [ "$target" = "centos6.5" ] ; then target=el6 ; fi
 if [ "$target" = "centos7" ] ; then target=el7 ; fi
 if [ "$target" = "fedora18" ] ; then target=fc18 ; fi
 if [ "$target" = "fedora19" ] ; then target=fc19 ; fi
 if [ "$target" = "fedora20" ] ; then target=fc20 ; fi
-if [ "$target" = "rhel6.3" ] ; then target=rhel6 ; fi
+if [ "$target" = "rhel6.5" ] ; then target=rhel6 ; fi
 if [ "$target" = "sles11sp2" ] ; then target=sles11 ; fi
 echo "Target directory is: $target"
 
diff --git a/ceph-release-rpm/config/definitions/ceph-release-rpm.yml b/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
index 6c3bf9f5d..7e36e3aae 100644
--- a/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
+++ b/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
@@ -28,9 +28,9 @@
           type: label-expression
           name: label_exp
           values:
-            - centos6.3
+            - centos6.5
             - centos7
-            - rhel6.3
+            - rhel6.5
             - fedora20
             - sles11sp2
             - rhel7