From: Ken Dreyer <kdreyer@redhat.com>
Date: Tue, 26 May 2015 20:17:04 +0000 (-0600)
Subject: remove fedora20 Jenkins slave
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F57%2Fhead;p=ceph-build.git

remove fedora20 Jenkins slave

Remove the Fedora 20 build slave from the job configs.

We're having trouble resurrecting
gitbuilder-cdep-rpm-cloud-fedora20-amd64-basic.cloud.sepia.ceph.com in
DreamCompute, and Fedora 20 itself is going EOL in a month or so.

This is the only Fedora builder we have, and this VM does build packages
for http://ceph.com/rpm-hammer/fc20/, so it would be nice to get fresh
Fedora build slaves set up eventually. But in the meantime, since this
one is giving us trouble, just remove it.
---

diff --git a/ceph-build/config/definitions/ceph-build.yml b/ceph-build/config/definitions/ceph-build.yml
index 69d04d3d..8ad3c700 100644
--- a/ceph-build/config/definitions/ceph-build.yml
+++ b/ceph-build/config/definitions/ceph-build.yml
@@ -33,7 +33,6 @@
             - centos7
             - rhel6.5
             - rhel7
-            - fedora20
 
     builders:
       - shell: |
diff --git a/ceph-deploy/config/definitions/ceph-deploy.yml b/ceph-deploy/config/definitions/ceph-deploy.yml
index 94991ae5..18f84174 100644
--- a/ceph-deploy/config/definitions/ceph-deploy.yml
+++ b/ceph-deploy/config/definitions/ceph-deploy.yml
@@ -50,7 +50,6 @@
             - centos6.5
             - centos7
             - rhel6.5
-            - fedora20
             - opensuse12.2
             - sles11sp2
             - rhel7
diff --git a/ceph-package/config/definitions/ceph-package.yml b/ceph-package/config/definitions/ceph-package.yml
index 989dbfec..5fc75efd 100644
--- a/ceph-package/config/definitions/ceph-package.yml
+++ b/ceph-package/config/definitions/ceph-package.yml
@@ -36,7 +36,6 @@
             - centos7
             - rhel6.5
             - rhel7
-            - fedora20
 
     builders:
 
diff --git a/ceph-release-rpm/build/build b/ceph-release-rpm/build/build
index 9502316c..f414df95 100644
--- a/ceph-release-rpm/build/build
+++ b/ceph-release-rpm/build/build
@@ -37,7 +37,6 @@ rm -rf RPMBUILD
 target=$DIST
 if [ "$target" = "centos6.5" ] ; then target=el6 ; fi
 if [ "$target" = "centos7" ] ; then target=el7 ; fi
-if [ "$target" = "fedora20" ] ; then target=fc20 ; 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 7e36e3aa..5890cac4 100644
--- a/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
+++ b/ceph-release-rpm/config/definitions/ceph-release-rpm.yml
@@ -31,7 +31,6 @@
             - centos6.5
             - centos7
             - rhel6.5
-            - fedora20
             - sles11sp2
             - rhel7
 
diff --git a/radosgw-agent/config/definitions/radosgw-agent.yml b/radosgw-agent/config/definitions/radosgw-agent.yml
index 102dc309..4d6fedc7 100644
--- a/radosgw-agent/config/definitions/radosgw-agent.yml
+++ b/radosgw-agent/config/definitions/radosgw-agent.yml
@@ -50,7 +50,6 @@
             - centos6.5
             - centos7
             - rhel6.5
-            - fedora20
             - opensuse12.2
             - sles11sp2
             - rhel7