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 69d04d3db3712d88c7b3f8de37bfa3585608bfd9..8ad3c700a8bd72934d8145462a4235ead6da7006 100644 (file)
--- 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 94991ae53274fd6b1a9a7dc79611feeafdaccffd..18f8417490cb183fa7bd902c137df3ed0c5fcb5b 100644 (file)
--- 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 989dbfec478d94f0043eeec1c6880d2dd33ec84e..5fc75efd666d60aadb74eff25fb215cea7f59a44 100644 (file)
--- 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 9502316cb1f5563abdeedf789c3f9a3a486e5694..f414df95d32dc73de793a6b1871b114fe21147a2 100644 (file)
--- 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 7e36e3aae6e2febf646a7c819ad865efae8c1c49..5890cac46cdb215f27e318086aaf4283bc72d50b 100644 (file)
--- 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 102dc30962c7691fc8dde4d9c1bd26aa01ee9b99..4d6fedc7e2f9a8b5e953fd6b7e99332d642182d9 100644 (file)
--- 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