# HG changeset patch # User Jon VanAlten # Date 1352417936 18000 # Node ID 9a1f4a5e1a829338337f8556ac065258f7fd801d # Parent 691ce9af397bd5ba7809e7e231fd8e32ccf1719c Remove EOL Fedora 15 slave from master.cfg diff -r 691ce9af397b -r 9a1f4a5e1a82 icedtea/master.cfg --- a/icedtea/master.cfg Mon Aug 20 15:55:59 2012 -0400 +++ b/icedtea/master.cfg Thu Nov 08 18:38:56 2012 -0500 @@ -45,9 +45,6 @@ max_builds=1), BuildSlave("fedora16-x86", getpw("vanaltj"), - max_builds=1), - BuildSlave("fedora15-x86", - getpw("vanaltj"), max_builds=1)] c['slavePortnum'] = 9989 @@ -76,7 +73,6 @@ "icedtea6-squeeze-x86_64-quick-jamvm", "icedtea6-squeeze-x86_64-quick-cacao", "icedtea6-squeeze-x86_64-quick-shark", - "icedtea6-f15-x86", "icedtea6-f16-x86", "icedtea6-natty-armv7l-quick", "icedtea6-natty-armv7l-quick-cacao", @@ -95,7 +91,6 @@ c['schedulers'].append(Scheduler(name="icedtea7-quick", branch="icedtea7", treeStableTimer=5*60, builderNames=["icedtea7-squeeze-x86_64-quick", - "icedtea7-f15-x86", "icedtea7-f16-x86", "icedtea7-squeeze-armv5tel-quick", "icedtea7-natty-armv7l-quick"] @@ -107,7 +102,6 @@ c['schedulers'].append(Scheduler(name="icedtea-web", branch="icedtea-web", treeStableTimer=60, builderNames=["icedtea-web-squeeze-x86_64", - "icedtea-web-f15-x86", "icedtea-web-f16-x86", "icedtea-web-squeeze-armv5tel", "icedtea-web-natty-armv7l"])) @@ -115,7 +109,6 @@ c['schedulers'].append(Scheduler(name="testrepo", branch="testrepo", treeStableTimer=60, builderNames=["testrepo-squeeze-x86_64", - "testrepo-f15-x86", "testrepo-f16-x86", "testrepo-natty-armv7l", "testrepo-lucid-ia32", @@ -214,18 +207,6 @@ 'builddir': "icedtea-web", 'factory': f1 } -f1f15 = factory.BuildFactory() -f1f15.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) -f1f15.addStep(ShellCommand(command=["./autogen.sh"], workdir="src", description="autogen")) -f1f15.addStep(ShellCommand(command=["rm", "-rf", "build"], workdir=".", description="clean build dir")) -f1f15.addStep(Configure(command=["../src/configure"], workdir="build")) -f1f15.addStep(Compile(command=["make", "-j4"], workdir="build")) -f1f15.addStep(JTRegCheck(command=["make", "check"], workdir="build")) -icedtea_web_builder_f15_x86 = { 'name': "icedtea-web-f15-x86", - 'slavenames': ["fedora15-x86"], - 'builddir': "f15-icedtea-web", - 'factory': f1f15 } - f1f16 = factory.BuildFactory() f1f16.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) f1f16.addStep(ShellCommand(command=["./autogen.sh"], workdir="src", description="autogen")) @@ -265,10 +246,6 @@ 'slavenames': ["squeeze-x86_64"], 'builddir': "testrepo", 'factory': f2 } -testrepo_builder_f15_x86 = { 'name': "testrepo-f15-x86", - 'slavenames': ["fedora15-x86"], - 'builddir': "f15-testrepo", - 'factory': f2 } testrepo_builder_f16_x86 = { 'name': "testrepo-f16-x86", 'slavenames': ["fedora16-x86"], 'builddir': "f16-testrepo", @@ -885,18 +862,10 @@ 'slavenames': ["squeeze-x86_64"], 'builddir': "icedtea6-quick-shark", 'factory': f3s } -icedtea6_builder_f15_x86 = { 'name': "icedtea6-f15-x86", - 'slavenames': ["fedora15-x86"], - 'builddir': "icedtea6-f15-x86", - 'factory': fnodocs } icedtea6_builder_f16_x86 = { 'name': "icedtea6-f16-x86", 'slavenames': ["fedora16-x86"], 'builddir': "icedtea6-f16-x86", 'factory': fnodocs } -icedtea7_builder_f15_x86 = { 'name': "icedtea7-f15-x86", - 'slavenames': ["fedora15-x86"], - 'builddir': "icedtea7-f15-x86", - 'factory': fnodocs } icedtea7_builder_f16_x86 = { 'name': "icedtea7-f16-x86", 'slavenames': ["fedora16-x86"], 'builddir': "icedtea7-f16-x86", @@ -1019,7 +988,6 @@ icedtea6_builder_quick_jamvm, icedtea6_builder_quick_cacao, icedtea6_builder_quick_shark, - icedtea6_builder_f15_x86, icedtea6_builder_f16_x86, icedtea6_builder_quick_arm_natty, icedtea6_builder_quick_arm_natty_cacao, @@ -1034,19 +1002,16 @@ icedtea6_builder_quick_armv5tel_squeeze_jamvm, icedtea6_builder_quick_armv5tel_squeeze_shark, icedtea7_builder_quick, - icedtea7_builder_f15_x86, icedtea7_builder_f16_x86, icedtea7_builder_quick_armv5tel_squeeze, icedtea7_builder_quick_arm_natty, icedtea6_builder_full, icedtea7_builder_full, icedtea_web_builder_x86_64, - icedtea_web_builder_f15_x86, icedtea_web_builder_f16_x86, icedtea_web_builder_squeeze_armv5tel, icedtea_web_builder_natty_armv7l, testrepo_builder_x86_64, - testrepo_builder_f15_x86, testrepo_builder_f16_x86, testrepo_builder_natty_armv7l, testrepo_builder_lucid_ia32,