changeset 35:f8eda904bd5d

Add bot2-armv5tel and bot3-armv5tel BuildSlaves. icedtea_web_builder_squeeze_armv5tel, testrepo_builder_squeeze_armv5tel, icedtea6_builder_quick_armv5tel_squeeze, icedtea6_builder_quick_armv5tel_squeeze_shark, icedtea6_builder_quick_armv5tel_squeeze_cacao, icedtea6_builder_quick_armv5tel_squeeze_jamvm, icedtea7_builder_quick_armv5tel_squeeze: Share work with the two new buildslaves. lucid-ia32: only run 1 task at a time for the ia32 builder. f3an, f3lz, f3ls, f3lc, f3lj: added killall step.
author Xerxes Ranby <xerxes@zafena.se>
date Mon, 07 Nov 2011 15:41:58 +0100
parents 315332789cb6
children 846ae02faf1a
files icedtea/master.cfg
diffstat 1 files changed, 39 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/icedtea/master.cfg	Fri Nov 04 15:16:40 2011 +0100
+++ b/icedtea/master.cfg	Mon Nov 07 15:41:58 2011 +0100
@@ -33,7 +33,13 @@
                           max_builds=1),
                BuildSlave("lucid-ia32",
                           getpw("jaunty-ia32"),
-                          max_builds=3),
+                          max_builds=1),
+               BuildSlave("bot3-armv5tel",
+                          getpw("squeeze-armv5tel"),
+                          max_builds=1)
+               BuildSlave("bot2-armv5tel",
+                          getpw("squeeze-armv5tel"),
+                          max_builds=1)
                BuildSlave("squeeze-armv5tel",
                           getpw("squeeze-armv5tel"),
                           max_builds=1)]
@@ -204,7 +210,7 @@
 f1arm.addStep(JTRegCheck(command=["make", "check"], workdir="build"))
 
 icedtea_web_builder_squeeze_armv5tel = { 'name': "icedtea-web-squeeze-armv5tel",
-                               'slavenames': ["squeeze-armv5tel"],
+                               'slavenames': ["squeeze-armv5tel", "bot2-armv5tel", "bot3-armv5tel"],
                                'builddir': "icedtea-web-squeeze-armv5tel",
                                'factory': f1arm }
 
@@ -230,7 +236,7 @@
                                   'builddir': "testrepo_lucid_ia32",
                                   'factory': f2 }
 testrepo_builder_squeeze_armv5tel = { 'name': "testrepo-squeeze-armv5tel",
-                                  'slavenames': ["squeeze-armv5tel"],
+                                  'slavenames': ["squeeze-armv5tel", "bot2-armv5tel", "bot3-armv5tel"],
                                   'builddir': "testrepo_squeeze_armv5tel",
                                   'factory': f2 }
 
@@ -393,6 +399,11 @@
 f3an.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
                       workdir="build", timeout=7200))
+f3an.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"],
+                        workdir=".",
+                        flunkOnFailure="False",
+                        alwaysRun="True",
+                        description="killall"))
 
 f3an7 = factory.BuildFactory()
 f3an7.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -542,6 +553,11 @@
 f3lz.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
                       workdir="build", timeout=7200))
+f3lz.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"],
+                        workdir=".",
+                        flunkOnFailure="False",
+                        alwaysRun="True",
+                        description="killall"))
 
 f3ls = factory.BuildFactory()
 f3ls.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -568,6 +584,11 @@
 f3ls.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
                       workdir="build", timeout=7200))
+f3ls.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"],
+                        workdir=".",
+                        flunkOnFailure="False",
+                        alwaysRun="True",
+                        description="killall"))
 
 f3lc = factory.BuildFactory()
 f3lc.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -594,6 +615,11 @@
 f3lc.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
                       workdir="build", timeout=7200))
+f3lc.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"],
+                        workdir=".",
+                        flunkOnFailure="False",
+                        alwaysRun="True",
+                        description="killall"))
 
 f3lj = factory.BuildFactory()
 f3lj.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -619,6 +645,11 @@
 f3lj.addStep(JTRegCheck(command=["make", "check-jdk"],
                       description="check-jdk",
                       workdir="build", timeout=7200))
+f3lj.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"],
+                        workdir=".",
+                        flunkOnFailure="False",
+                        alwaysRun="True",
+                        description="killall"))
 
 f3a5 = factory.BuildFactory()
 f3a5.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -811,22 +842,22 @@
                            'factory': f3lz }
 icedtea6_builder_quick_armv5tel_squeeze = {
                            'name': "icedtea6-squeeze-armv5tel-quick",
-                           'slavenames': ["squeeze-armv5tel"],
+                           'slavenames': ["squeeze-armv5tel", "bot2-armv5tel", "bot3-armv5tel"],
                            'builddir': "icedtea6-squeeze-armv5tel-quick",
                            'factory': f3a5 }
 icedtea6_builder_quick_armv5tel_squeeze_shark = {
                            'name': "icedtea6-squeeze-armv5tel-quick-shark",
-                           'slavenames': ["squeeze-armv5tel"],
+                           'slavenames': ["squeeze-armv5tel", "bot2-armv5tel", "bot3-armv5tel"],
                            'builddir': "icedtea6-squeeze-armv5tel-quick-shark",
                            'factory': f3a5s }
 icedtea6_builder_quick_armv5tel_squeeze_cacao = {
                            'name': "icedtea6-squeeze-armv5tel-quick-cacao",
-                           'slavenames': ["squeeze-armv5tel"],
+                           'slavenames': ["squeeze-armv5tel", "bot2-armv5tel", "bot3-armv5tel"],
                            'builddir': "icedtea6-squeeze-armv5tel-quick-cacao",
                            'factory': f3a5c }
 icedtea6_builder_quick_armv5tel_squeeze_jamvm = {
                            'name': "icedtea6-squeeze-armv5tel-quick-jamvm",
-                           'slavenames': ["squeeze-armv5tel"],
+                           'slavenames': ["squeeze-armv5tel", "bot2-armv5tel", "bot3-armv5tel"],
                            'builddir': "icedtea6-squeeze-armv5tel-quick-jamvm",
                            'factory': f3a5j }
 icedtea7_builder_quick = { 'name': "icedtea7-squeeze-x86_64-quick",
@@ -835,7 +866,7 @@
                            'factory': f3s7 }
 icedtea7_builder_quick_armv5tel_squeeze = {
                            'name': "icedtea7-squeeze-armv5tel-quick",
-                           'slavenames': ["squeeze-armv5tel"],
+                           'slavenames': ["squeeze-armv5tel", "bot2-armv5tel", "bot3-armv5tel"],
                            'builddir': "icedtea7-squeeze-armv5tel-quick",
                            'factory': f3a5 }
 icedtea7_builder_quick_arm_natty = { 'name': "icedtea7-natty-armv7l-quick",