changeset 27:ebaaa32e45e2

jaunty EOL: jaunty_ia32 builder replaced by karmic_ia32. Build factory changes: f3jz replaced by f3kz f3js replaced by f3ks f3jc replaced by f3kc f3jj replaced by f3kj f3ks added check-jdk f3kc added check-jdk f3kj added check-jdk
author Xerxes R?nby <xerxes@zafena.se>
date Tue, 02 Aug 2011 21:50:37 +0200
parents 7c62f6d0b732
children 857af5a797b9
files icedtea/master.cfg
diffstat 1 files changed, 75 insertions(+), 66 deletions(-) [+]
line wrap: on
line diff
--- a/icedtea/master.cfg	Tue Aug 02 19:28:28 2011 +0200
+++ b/icedtea/master.cfg	Tue Aug 02 21:50:37 2011 +0200
@@ -31,7 +31,7 @@
                BuildSlave("natty-armv7l",
                           getpw("natty-armv7l"),
                           max_builds=1),
-               BuildSlave("jaunty-ia32",
+               BuildSlave("karmic-ia32",
                           getpw("jaunty-ia32"),
                           max_builds=3),
                BuildSlave("squeeze-armv5tel",
@@ -67,10 +67,10 @@
                                        "icedtea6-natty-armv7l-quick-cacao",
                                        "icedtea6-natty-armv7l-quick-jamvm",
                                        "icedtea6-natty-armv7l-quick-shark",
-                                       "icedtea6-jaunty-ia32-quick-zero",
-                                       "icedtea6-jaunty-ia32-quick-cacao",
-                                       "icedtea6-jaunty-ia32-quick-jamvm",
-                                       "icedtea6-jaunty-ia32-quick-shark",
+                                       "icedtea6-karmic-ia32-quick-zero",
+                                       "icedtea6-karmic-ia32-quick-cacao",
+                                       "icedtea6-karmic-ia32-quick-jamvm",
+                                       "icedtea6-karmic-ia32-quick-shark",
                                        "icedtea6-squeeze-armv5tel-quick",
                                        "icedtea6-squeeze-armv5tel-quick-cacao",
                                        "icedtea6-squeeze-armv5tel-quick-jamvm",
@@ -97,7 +97,7 @@
                                  treeStableTimer=60,
                                  builderNames=["testrepo-squeeze-x86_64",
                                                "testrepo-natty-armv7l",
-                                               "testrepo-jaunty-ia32",
+                                               "testrepo-karmic-ia32",
                                                "testrepo-squeeze-armv5tel"]))
 
 # Full scheduler for icedtea6 or icedtea7 branches.
@@ -224,9 +224,9 @@
                                   'slavenames': ["natty-armv7l"],
                                   'builddir': "testrepo_natty_armv7l",
                                   'factory': f2 }
-testrepo_builder_jaunty_ia32 = { 'name': "testrepo-jaunty-ia32",
-                                  'slavenames': ["jaunty-ia32"],
-                                  'builddir': "testrepo_jaunty_ia32",
+testrepo_builder_karmic_ia32 = { 'name': "testrepo-karmic-ia32",
+                                  'slavenames': ["karmic-ia32"],
+                                  'builddir': "testrepo_karmic_ia32",
                                   'factory': f2 }
 testrepo_builder_squeeze_armv5tel = { 'name': "testrepo-squeeze-armv5tel",
                                   'slavenames': ["squeeze-armv5tel"],
@@ -470,96 +470,105 @@
                       description="check-langtools",
                       workdir="build", timeout=2400))
 
-f3jz = factory.BuildFactory()
-f3jz.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
-f3jz.addStep(ShellCommand(command=["./autogen.sh"],
+f3kz = factory.BuildFactory()
+f3kz.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
+f3kz.addStep(ShellCommand(command=["./autogen.sh"],
                         workdir="src",
                         description="autogen"))
-f3jz.addStep(ShellCommand(command=["rm", "-rf", "build"],
+f3kz.addStep(ShellCommand(command=["rm", "-rf", "build"],
                         workdir=".",
                         description="clean build dir"))
-f3jz.addStep(Configure(command=["../src/configure",
+f3kz.addStep(Configure(command=["../src/configure",
                               "--disable-bootstrap",
                               "--with-parallel-jobs=5",
                               "--disable-docs",
                               "--with-hotspot-build",
                               "--enable-zero"],
                               workdir="build"))
-f3jz.addStep(Compile(workdir="build"))
-f3jz.addStep(JTRegCheck(command=["make", "check-hotspot"],
+f3kz.addStep(Compile(workdir="build"))
+f3kz.addStep(JTRegCheck(command=["make", "check-hotspot"],
                       description="check-hotspot",
                       workdir="build"))
-f3jz.addStep(JTRegCheck(command=["make", "check-langtools"],
+f3kz.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
                       workdir="build", timeout=2400))
 
-f3js = factory.BuildFactory()
-f3js.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
-f3js.addStep(ShellCommand(command=["./autogen.sh"],
+f3ks = factory.BuildFactory()
+f3ks.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
+f3ks.addStep(ShellCommand(command=["./autogen.sh"],
                         workdir="src",
                         description="autogen"))
-f3js.addStep(ShellCommand(command=["rm", "-rf", "build"],
+f3ks.addStep(ShellCommand(command=["rm", "-rf", "build"],
                         workdir=".",
                         description="clean build dir"))
-f3js.addStep(Configure(command=["../src/configure",
+f3ks.addStep(Configure(command=["../src/configure",
                               "--disable-bootstrap",
                               "--with-parallel-jobs=5",
                               "--disable-docs",
                               "--with-hotspot-build",
                               "--enable-shark"],
                               workdir="build"))
-f3js.addStep(Compile(workdir="build"))
-f3js.addStep(JTRegCheck(command=["make", "check-hotspot"],
+f3ks.addStep(Compile(workdir="build"))
+f3ks.addStep(JTRegCheck(command=["make", "check-hotspot"],
                       description="check-hotspot",
                       workdir="build"))
-f3js.addStep(JTRegCheck(command=["make", "check-langtools"],
+f3ks.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
                       workdir="build", timeout=2400))
+f3ks.addStep(JTRegCheck(command=["make", "check-jdk"],
+                      description="check-jdk",
+                      workdir="build", timeout=2400))
 
-f3jc = factory.BuildFactory()
-f3jc.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
-f3jc.addStep(ShellCommand(command=["./autogen.sh"],
+f3kc = factory.BuildFactory()
+f3kc.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
+f3kc.addStep(ShellCommand(command=["./autogen.sh"],
                         workdir="src",
                         description="autogen"))
-f3jc.addStep(ShellCommand(command=["rm", "-rf", "build"],
+f3kc.addStep(ShellCommand(command=["rm", "-rf", "build"],
                         workdir=".",
                         description="clean build dir"))
-f3jc.addStep(Configure(command=["../src/configure",
+f3kc.addStep(Configure(command=["../src/configure",
                               "--disable-bootstrap",
                               "--with-parallel-jobs=5",
                               "--disable-docs",
                               "--with-hotspot-build", 
                               "--enable-cacao"],
                               workdir="build"))
-f3jc.addStep(Compile(workdir="build"))
-f3jc.addStep(JTRegCheck(command=["make", "check-hotspot"],
+f3kc.addStep(Compile(workdir="build"))
+f3kc.addStep(JTRegCheck(command=["make", "check-hotspot"],
                       description="check-hotspot",
                       workdir="build"))
-f3jc.addStep(JTRegCheck(command=["make", "check-langtools"],
+f3kc.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
                       workdir="build", timeout=2400))
+f3kc.addStep(JTRegCheck(command=["make", "check-jdk"],
+                      description="check-jdk",
+                      workdir="build", timeout=2400))
 
-f3jj = factory.BuildFactory()
-f3jj.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
-f3jj.addStep(ShellCommand(command=["./autogen.sh"],
+f3kj = factory.BuildFactory()
+f3kj.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
+f3kj.addStep(ShellCommand(command=["./autogen.sh"],
                         workdir="src",
                         description="autogen"))
-f3jj.addStep(ShellCommand(command=["rm", "-rf", "build"],
+f3kj.addStep(ShellCommand(command=["rm", "-rf", "build"],
                         workdir=".",
                         description="clean build dir"))
-f3jj.addStep(Configure(command=["../src/configure",
+f3kj.addStep(Configure(command=["../src/configure",
                               "--enable-jamvm",
                               "--disable-bootstrap",
                               "--with-parallel-jobs=2",
                               "--disable-docs"],
                               workdir="build"))
-f3jj.addStep(Compile(workdir="build"))
-f3jj.addStep(JTRegCheck(command=["make", "check-hotspot"],
+f3kj.addStep(Compile(workdir="build"))
+f3kj.addStep(JTRegCheck(command=["make", "check-hotspot"],
                       description="check-hotspot",
                       workdir="build"))
-f3jj.addStep(JTRegCheck(command=["make", "check-langtools"],
+f3kj.addStep(JTRegCheck(command=["make", "check-langtools"],
                       description="check-langtools",
                       workdir="build", timeout=2400))
+f3kj.addStep(JTRegCheck(command=["make", "check-jdk"],
+                      description="check-jdk",
+                      workdir="build", timeout=2400))
 
 f3a5 = factory.BuildFactory()
 f3a5.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -694,26 +703,26 @@
                            'slavenames': ["natty-armv7l"],
                            'builddir': "icedtea6-natty-armv7l-quick-shark",
                            'factory': f3ans }
-icedtea6_builder_quick_ia32_jaunty_shark = {
-                           'name': "icedtea6-jaunty-ia32-quick-shark",
-                           'slavenames': ["jaunty-ia32"],
-                           'builddir': "icedtea6-jaunty-ia32-quick-shark",
-                           'factory': f3js }
-icedtea6_builder_quick_ia32_jaunty_cacao = {
-                           'name': "icedtea6-jaunty-ia32-quick-cacao",
-                           'slavenames': ["jaunty-ia32"],
-                           'builddir': "icedtea6-jaunty-ia32-quick-cacao",
-                           'factory': f3jc }
-icedtea6_builder_quick_ia32_jaunty_jamvm = {
-                           'name': "icedtea6-jaunty-ia32-quick-jamvm",
-                           'slavenames': ["jaunty-ia32"],
-                           'builddir': "icedtea6-jaunty-ia32-quick-jamvm",
-                           'factory': f3jj }
-icedtea6_builder_quick_ia32_jaunty_zero = {
-                           'name': "icedtea6-jaunty-ia32-quick-zero",
-                           'slavenames': ["jaunty-ia32"],
-                           'builddir': "icedtea6-jaunty-ia32-quick-zero",
-                           'factory': f3jz }
+icedtea6_builder_quick_ia32_karmic_shark = {
+                           'name': "icedtea6-karmic-ia32-quick-shark",
+                           'slavenames': ["karmic-ia32"],
+                           'builddir': "icedtea6-karmic-ia32-quick-shark",
+                           'factory': f3ks }
+icedtea6_builder_quick_ia32_karmic_cacao = {
+                           'name': "icedtea6-karmic-ia32-quick-cacao",
+                           'slavenames': ["karmic-ia32"],
+                           'builddir': "icedtea6-karmic-ia32-quick-cacao",
+                           'factory': f3kc }
+icedtea6_builder_quick_ia32_karmic_jamvm = {
+                           'name': "icedtea6-karmic-ia32-quick-jamvm",
+                           'slavenames': ["karmic-ia32"],
+                           'builddir': "icedtea6-karmic-ia32-quick-jamvm",
+                           'factory': f3kj }
+icedtea6_builder_quick_ia32_karmic_zero = {
+                           'name': "icedtea6-karmic-ia32-quick-zero",
+                           'slavenames': ["karmic-ia32"],
+                           'builddir': "icedtea6-karmic-ia32-quick-zero",
+                           'factory': f3kz }
 icedtea6_builder_quick_armv5tel_squeeze = {
                            'name': "icedtea6-squeeze-armv5tel-quick",
                            'slavenames': ["squeeze-armv5tel"],
@@ -795,10 +804,10 @@
                  icedtea6_builder_quick_arm_natty_cacao,
                  icedtea6_builder_quick_arm_natty_jamvm,
                  icedtea6_builder_quick_arm_natty_shark,
-                 icedtea6_builder_quick_ia32_jaunty_shark,
-                 icedtea6_builder_quick_ia32_jaunty_cacao,
-                 icedtea6_builder_quick_ia32_jaunty_jamvm,
-                 icedtea6_builder_quick_ia32_jaunty_zero,
+                 icedtea6_builder_quick_ia32_karmic_shark,
+                 icedtea6_builder_quick_ia32_karmic_cacao,
+                 icedtea6_builder_quick_ia32_karmic_jamvm,
+                 icedtea6_builder_quick_ia32_karmic_zero,
                  icedtea6_builder_quick_armv5tel_squeeze,
                  icedtea6_builder_quick_armv5tel_squeeze_cacao,
                  icedtea6_builder_quick_armv5tel_squeeze_jamvm,
@@ -813,7 +822,7 @@
                  icedtea_web_builder_natty_armv7l,
                  testrepo_builder_x86_64,
                  testrepo_builder_natty_armv7l,
-                 testrepo_builder_jaunty_ia32,
+                 testrepo_builder_karmic_ia32,
                  testrepo_builder_squeeze_armv5tel ]
 
 ####### STATUS TARGETS