/hg/buildbot: 2011-02-22 Xerxes Ranby <xerxes at zafena.se>
xranby at icedtea.classpath.org
xranby at icedtea.classpath.org
Tue Feb 22 05:13:28 PST 2011
changeset c9d0b3347e4d in /hg/buildbot
details: http://icedtea.classpath.org/hg/buildbot?cmd=changeset;node=c9d0b3347e4d
author: Xerxes R?nby <xerxes at zafena.se>
date: Tue Feb 22 13:56:45 2011 +0100
2011-02-22 Xerxes Ranby <xerxes at zafena.se>
make jaunty-ia32 builders track the "alternative" hotspot --with-
hotspot-build
decomission icedtea6-squeeze-armv7l slave. remove icedtea6-squeeze-
armv7l-quick icedtea7-squeeze-armv7l-quick icedtea-web-
squeeze-armv7l and testrepo-squeeze-armv7l builders.
update squeeze-armv5tel slave to build icedtea7-squeeze-armv5tel-
quick and icedtea-web-squeeze-
armv5tel
diffstat:
1 file changed, 15 insertions(+), 46 deletions(-)
icedtea/master.cfg | 61 ++++++++++++----------------------------------------
diffs (174 lines):
diff -r 15bb449380ba -r c9d0b3347e4d icedtea/master.cfg
--- a/icedtea/master.cfg Mon Feb 21 11:08:43 2011 +0100
+++ b/icedtea/master.cfg Tue Feb 22 13:56:45 2011 +0100
@@ -28,9 +28,6 @@ c['slaves'] = [BuildSlave("squeeze-x86_6
c['slaves'] = [BuildSlave("squeeze-x86_64",
getpw("squeeze-x86_64"),
max_builds=3),
- BuildSlave("squeeze-armv7l",
- getpw("squeeze-armv7l"),
- max_builds=1),
BuildSlave("natty-armv7l",
getpw("natty-armv7l"),
max_builds=2),
@@ -62,7 +59,6 @@ c['schedulers'].append(Scheduler(name="i
c['schedulers'].append(Scheduler(name="icedtea6-quick", branch="icedtea6",
treeStableTimer=5*60,
builderNames=["icedtea6-squeeze-x86_64-quick",
- "icedtea6-squeeze-armv7l-quick",
"icedtea6-natty-armv7l-quick",
"icedtea6-natty-armv7l-quick-cacao",
"icedtea6-natty-armv7l-quick-shark",
@@ -77,7 +73,7 @@ c['schedulers'].append(Scheduler(name="i
c['schedulers'].append(Scheduler(name="icedtea7-quick", branch="icedtea",
treeStableTimer=5*60,
builderNames=["icedtea7-squeeze-x86_64-quick",
- "icedtea7-squeeze-armv7l-quick",
+ "icedtea7-squeeze-armv5tel-quick",
"icedtea7-natty-armv7l-quick"]
))
@@ -87,13 +83,12 @@ c['schedulers'].append(Scheduler(name="i
c['schedulers'].append(Scheduler(name="icedtea-web", branch="icedtea-web",
treeStableTimer=60,
builderNames=["icedtea-web-squeeze-x86_64",
- "icedtea-web-squeeze-armv7l",
+ "icedtea-web-squeeze-armv5tel",
"icedtea-web-natty-armv7l"]))
c['schedulers'].append(Scheduler(name="testrepo", branch="testrepo",
treeStableTimer=60,
builderNames=["testrepo-squeeze-x86_64",
- "testrepo-squeeze-armv7l",
"testrepo-natty-armv7l",
"testrepo-jaunty-ia32",
"testrepo-squeeze-armv5tel"]))
@@ -201,10 +196,11 @@ f1arm.addStep(Compile(command=["make", "
f1arm.addStep(Compile(command=["make", "-j2"], workdir="build"))
f1arm.addStep(Test(command=["make", "check"], workdir="build"))
-icedtea_web_builder_squeeze_armv7l = { 'name': "icedtea-web-squeeze-armv7l",
- 'slavenames': ["squeeze-armv7l"],
- 'builddir': "icedtea-web-squeeze-armv7l",
+icedtea_web_builder_squeeze_armv5tel = { 'name': "icedtea-web-squeeze-armv5tel",
+ 'slavenames': ["squeeze-armv5tel"],
+ 'builddir': "icedtea-web-squeeze-armv5tel",
'factory': f1arm }
+
icedtea_web_builder_natty_armv7l = { 'name': "icedtea-web-natty-armv7l",
'slavenames': ["natty-armv7l"],
'builddir': "icedtea-web-natty-armv7l",
@@ -217,10 +213,6 @@ testrepo_builder_x86_64 = { 'name': "tes
testrepo_builder_x86_64 = { 'name': "testrepo-squeeze-x86_64",
'slavenames': ["squeeze-x86_64"],
'builddir': "testrepo",
- 'factory': f2 }
-testrepo_builder_squeeze_armv7l = { 'name': "testrepo-squeeze-armv7l",
- 'slavenames': ["squeeze-armv7l"],
- 'builddir': "testrepo_squeeze_armv7l",
'factory': f2 }
testrepo_builder_natty_armv7l = { 'name': "testrepo-natty-armv7l",
'slavenames': ["natty-armv7l"],
@@ -258,26 +250,6 @@ f3.addStep(JTRegCheck(command=["make", "
f3.addStep(JTRegCheck(command=["make", "check-langtools"],
description="check-langtools",
workdir="build"))
-
-f3as = factory.BuildFactory()
-f3as.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
-f3as.addStep(ShellCommand(command=["./autogen.sh"],
- workdir="src",
- description="autogen"))
-f3as.addStep(ShellCommand(command=["rm", "-rf", "build"],
- workdir=".",
- description="clean build dir"))
-f3as.addStep(Configure(command=["../src/configure",
- "--disable-bootstrap",
- "--disable-docs"],
- workdir="build"))
-f3as.addStep(Compile(workdir="build"))
-f3as.addStep(JTRegCheck(command=["make", "check-hotspot"],
- description="check-hotspot",
- workdir="build"))
-f3as.addStep(JTRegCheck(command=["make", "check-langtools"],
- description="check-langtools",
- workdir="build", timeout=2400))
f3an = factory.BuildFactory()
f3an.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
@@ -356,6 +328,7 @@ f3jz.addStep(Configure(command=["../src/
"--disable-bootstrap",
"--with-parallel-jobs=5",
"--disable-docs",
+ "--with-hotspot-build",
"--enable-zero"],
workdir="build"))
f3jz.addStep(Compile(workdir="build"))
@@ -378,6 +351,7 @@ f3js.addStep(Configure(command=["../src/
"--disable-bootstrap",
"--with-parallel-jobs=5",
"--disable-docs",
+ "--with-hotspot-build",
"--enable-shark"],
workdir="build"))
f3js.addStep(Compile(workdir="build"))
@@ -400,6 +374,7 @@ f3jc.addStep(Configure(command=["../src/
"--disable-bootstrap",
"--with-parallel-jobs=5",
"--disable-docs",
+ "--with-hotspot-build",
"--enable-cacao"],
workdir="build"))
f3jc.addStep(Compile(workdir="build"))
@@ -479,10 +454,6 @@ icedtea6_builder_quick = { 'name': "iced
'slavenames': ["squeeze-x86_64"],
'builddir': "icedtea6-quick",
'factory': f3 }
-icedtea6_builder_quick_arm_squeeze = { 'name': "icedtea6-squeeze-armv7l-quick",
- 'slavenames': ["squeeze-armv7l"],
- 'builddir': "icedtea6-squeeze-armv7l-quick",
- 'factory': f3as }
icedtea6_builder_quick_arm_natty = { 'name': "icedtea6-natty-armv7l-quick",
'slavenames': ["natty-armv7l"],
'builddir': "icedtea6-natty-armv7l-quick",
@@ -532,10 +503,10 @@ icedtea7_builder_quick = { 'name': "iced
'slavenames': ["squeeze-x86_64"],
'builddir': "icedtea7-quick",
'factory': f3 }
-icedtea7_builder_quick_arm_squeeze = { 'name': "icedtea7-squeeze-armv7l-quick",
- 'slavenames': ["squeeze-armv7l"],
- 'builddir': "icedtea7-squeeze-armv7l-quick",
- 'factory': f3as }
+icedtea7_builder_quick_arm_squeeze = { 'name': "icedtea7-squeeze-armv5tel-quick",
+ 'slavenames': ["squeeze-armv5tel"],
+ 'builddir': "icedtea7-squeeze-armv5tel-quick",
+ 'factory': f3a5 }
icedtea7_builder_quick_arm_natty = { 'name': "icedtea7-natty-armv7l-quick",
'slavenames': ["natty-armv7l"],
'builddir': "icedtea7-natty-armv7l-quick",
@@ -579,7 +550,6 @@ icedtea7_builder_full = { 'name': "icedt
'factory': f4 }
c['builders'] = [icedtea6_builder_quick,
- icedtea6_builder_quick_arm_squeeze,
icedtea6_builder_quick_arm_natty,
icedtea6_builder_quick_arm_natty_cacao,
icedtea6_builder_quick_arm_natty_shark,
@@ -590,15 +560,14 @@ c['builders'] = [icedtea6_builder_quick,
icedtea6_builder_quick_armv5tel_squeeze_cacao,
icedtea6_builder_quick_armv5tel_squeeze_shark,
icedtea7_builder_quick,
- icedtea7_builder_quick_arm_squeeze,
+ icedtea7_builder_quick_armv5tel_squeeze,
icedtea7_builder_quick_arm_natty,
icedtea6_builder_full,
icedtea7_builder_full,
icedtea_web_builder_x86_64,
- icedtea_web_builder_squeeze_armv7l,
+ icedtea_web_builder_squeeze_armv5tel,
icedtea_web_builder_natty_armv7l,
testrepo_builder_x86_64,
- testrepo_builder_squeeze_armv7l,
testrepo_builder_natty_armv7l,
testrepo_builder_jaunty_ia32,
testrepo_builder_squeeze_armv5tel ]
More information about the distro-pkg-dev
mailing list