# HG changeset patch
# User Mark Wielaard <mark@klomp.org>
# Date 1320951244 -3600
# Node ID 32ff60cc1ae2db0ce2dd306e95261c8d45f43be2
# Parent  f01ccf3f2780c22138b10e93d58ca5642aefd66c
Hook up f15 and f16 builders to testrepo and icedtea-web.

diff -r f01ccf3f2780 -r 32ff60cc1ae2 icedtea/master.cfg
--- a/icedtea/master.cfg	Thu Nov 10 11:14:54 2011 -0500
+++ b/icedtea/master.cfg	Thu Nov 10 19:54:04 2011 +0100
@@ -103,12 +103,16 @@
 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"]))
 
 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",
                                                "testrepo-squeeze-armv5tel"]))
@@ -206,6 +210,30 @@
                                '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"))
+f1f16.addStep(ShellCommand(command=["rm", "-rf", "build"], workdir=".", description="clean build dir"))
+f1f16.addStep(Configure(command=["../src/configure"], workdir="build"))
+f1f16.addStep(Compile(command=["make", "-j4"], workdir="build"))
+f1f16.addStep(JTRegCheck(command=["make", "check"], workdir="build"))
+icedtea_web_builder_f16_x86 = { 'name': "icedtea-web-f16-x86",
+                               'slavenames': ["fedora16-x86"],
+                               'builddir': "f16-icedtea-web",
+                               'factory': f1f16 }
+
 f1arm = factory.BuildFactory()
 f1arm.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
 f1arm.addStep(ShellCommand(command=["./autogen.sh"], workdir="src", description="autogen"))
@@ -233,6 +261,14 @@
                             '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",
+                            'factory': f2 }
 testrepo_builder_natty_armv7l = { 'name': "testrepo-natty-armv7l",
                                   'slavenames': ["natty-armv7l"],
                                   'builddir': "testrepo_natty_armv7l",
@@ -942,9 +978,13 @@
                  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,
                  testrepo_builder_squeeze_armv5tel ]