Mercurial > hg > buildbot
changeset 55:5e60264eb933
Perform extensive cleanup and add support for building IcedTea 3.x with OpenJDK 8.
* Remove duplicate configure options from build.sh.
* Drop HotSpot, JamVM & CACAO quick builds from 6 (covered by main quick build)
* Make Shark build a full bootstrap
* Cleanup naming of builders, updating squeeze to wheezy
* Cleanup naming of factories to make it more obvious which corresponds to which builder
* Cleanup ordering so IcedTea 6/7/8 grouped together
* Add quick, shark, armv7 and f16 builds for IcedTea8.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Fri, 18 Apr 2014 18:42:40 +0100 |
| parents | ddb0e5427eb4 |
| children | 9470f0df7040 |
| files | icedtea/build.sh icedtea/master.cfg |
| diffstat | 2 files changed, 355 insertions(+), 302 deletions(-) [+] |
line wrap: on
line diff
--- a/icedtea/build.sh Thu Dec 26 14:49:55 2013 +0000 +++ b/icedtea/build.sh Fri Apr 18 18:42:40 2014 +0100 @@ -110,18 +110,6 @@ # Make sure a failure in any command in a pipe, fails the whole pipe command. set -o pipefail -# Some additional VMs only build against one or the other version. -if [ "${VERSIONSTR}" == "6" ]; then - ICEDTEA_ADDITIONAL_VMS="cacao,jamvm,shark,zero" - ADDITIONAL_OPTIONS="" -elif [ "${VERSIONSTR}" == "7" ]; then - ICEDTEA_ADDITIONAL_VMS="cacao,jamvm" - ADDITIONAL_OPTIONS="--disable-system-lcms --disable-system-gio" -else - ICEDTEA_ADDITIONAL_VMS="" - ADDITIONAL_OPTIONS="--disable-system-lcms" -fi - # Build in separate dir. # Figure out a way to use local openjdk tar.gz files # maybe just copy to to an archive dir before cleanup and then copy back. @@ -130,8 +118,6 @@ && cd $ICEDTEA_BUILD_DIR \ && $ICEDTEA_DIR/configure \ --enable-nss \ - $ADDITIONAL_OPTIONS \ - --with-additional-vms=$ICEDTEA_ADDITIONAL_VMS \ && make VERBOSE=true) 2>&1 | tee $BUILD_LOG_FILE BUILD_RESULT=$?
--- a/icedtea/master.cfg Thu Dec 26 14:49:55 2013 +0000 +++ b/icedtea/master.cfg Fri Apr 18 18:42:40 2014 +0100 @@ -64,15 +64,12 @@ # "Quick" schedulers for icedtea6 and 7 # Schedules a quick build (no bootstrap, no documentation) # after waiting 5 minutes for any more changes. -# the x85_64 builders also skips check-jdk to prevent server hickups since +# the x86_64 builders also skips check-jdk to prevent server hickups since # they are running on the buildmaster. c['schedulers'].append(Scheduler(name="icedtea6-quick", branch="icedtea6", treeStableTimer=5*60, - builderNames=["icedtea6-squeeze-x86_64-quick", - "icedtea6-squeeze-x86_64-quick-hotspot", - "icedtea6-squeeze-x86_64-quick-jamvm", - "icedtea6-squeeze-x86_64-quick-cacao", - "icedtea6-squeeze-x86_64-quick-shark", + builderNames=["icedtea6-wheezy-x86_64-quick", + "icedtea6-wheezy-x86_64-quick-shark", "icedtea6-f16-x86", "icedtea6-natty-armv7l-quick", "icedtea6-natty-armv7l-quick-cacao", @@ -90,12 +87,22 @@ c['schedulers'].append(Scheduler(name="icedtea7-quick", branch="icedtea7", treeStableTimer=5*60, - builderNames=["icedtea7-squeeze-x86_64-quick", + builderNames=["icedtea7-wheezy-x86_64-quick", + "icedtea7-wheezy-x86_64-shark", "icedtea7-f16-x86", "icedtea7-squeeze-armv5tel-quick", "icedtea7-natty-armv7l-quick"] )) +c['schedulers'].append(Scheduler(name="icedtea8-quick", branch="icedtea", + treeStableTimer=5*60, + builderNames=["icedtea8-wheezy-x86_64-quick", + "icedtea8-wheezy-x86_64-shark", + "icedtea8-f16-x86", + "icedtea8-squeeze-armv5tel-quick", + "icedtea8-natty-armv7l-quick"] + )) + # "Normal" schedulers for icedtea-web and testrepo. # Schedules a full build of either branch after waiting 60 seconds # for any more changes. @@ -114,7 +121,7 @@ "testrepo-lucid-ia32", "testrepo-squeeze-armv5tel"])) -# Full scheduler for icedtea6 or icedtea7 branches. +# Full scheduler for icedtea6, icedtea7 or icedtea8 branches. # Triggers every 8 hours if there were changes. Schedules a full build # that includes documentation and jdk-check. Takes multiple hours. # The trigger times are shifted 4 hours to minimize overlap. @@ -123,12 +130,17 @@ onlyIfChanged=True, hour=range(0, 24, 8), minute=38, - builderNames=["icedtea6-squeeze-x86_64-full"])) + builderNames=["icedtea6-wheezy-x86_64-full"])) c['schedulers'].append(Nightly(name="icedtea7-full", branch="icedtea7", onlyIfChanged=True, hour=range(4, 24, 8), minute=8, - builderNames=["icedtea7-squeeze-x86_64-full"])) + builderNames=["icedtea7-wheezy-x86_64-full"])) +c['schedulers'].append(Nightly(name="icedtea8-full", branch="icedtea", + onlyIfChanged=True, + hour=range(4, 24, 8), + minute=8, + builderNames=["icedtea8-wheezy-x86_64-full"])) ####### BUILDERS @@ -263,181 +275,7 @@ 'builddir': "testrepo_squeeze_armv5tel", 'factory': f2 } -#icedtea6-squeeze-x86_64-quick -f3s6 = factory.BuildFactory() -f3s6.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) -f3s6.addStep(ShellCommand(command=["./autogen.sh"], - workdir="src", - description="autogen")) -f3s6.addStep(ShellCommand(command=["rm", "-rf", "build"], - workdir=".", - description="clean build dir")) -f3s6.addStep(Configure(command=["../src/configure", - "--disable-bootstrap", - "--disable-optimizations", - "--disable-system-lcms", - "--disable-docs", - "--with-additional-vms=jamvm,cacao,shark", - "--with-parallel-jobs=4", - "--with-llvm-config=llvm-config-2.7"], - workdir="build")) -f3s6.addStep(Compile(workdir="build")) -f3s6.addStep(JTRegCheck(command=["make", "check-hotspot"], - description="check-hotspot", - workdir="build")) -f3s6.addStep(JTRegCheck(command=["make", "check-langtools"], - description="check-langtools", - workdir="build")) - -f3s7 = factory.BuildFactory() -f3s7.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) -f3s7.addStep(ShellCommand(command=["./autogen.sh"], - workdir="src", - description="autogen")) -f3s7.addStep(ShellCommand(command=["rm", "-rf", "build"], - workdir=".", - description="clean build dir")) -f3s7.addStep(Configure(command=["../src/configure", - "--disable-bootstrap", - "--disable-optimizations", - "--disable-docs", - "--with-additional-vms=shark", - "--with-parallel-jobs=4", - "--with-llvm-config=llvm-config-2.7", - "--disable-system-gio", - "--disable-system-gtk", - "--disable-system-lcms"], - workdir="build")) -f3s7.addStep(Compile(workdir="build")) -f3s7.addStep(JTRegCheck(command=["make", "check-hotspot"], - description="check-hotspot", - workdir="build")) -f3s7.addStep(JTRegCheck(command=["make", "check-langtools"], - description="check-langtools", - workdir="build")) - -#icedtea6-squeeze-x86_64-quick-hotspot -f3h = factory.BuildFactory() -f3h.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) -f3h.addStep(ShellCommand(command=["./autogen.sh"], - workdir="src", - description="autogen")) -f3h.addStep(ShellCommand(command=["rm", "-rf", "build"], - workdir=".", - description="clean build dir")) -f3h.addStep(Configure(command=["../src/configure", - "--disable-bootstrap", - "--disable-optimizations", - "--disable-system-lcms", - "--disable-docs", - "--with-hotspot-build", - "--with-parallel-jobs=4"], - workdir="build")) -f3h.addStep(Compile(workdir="build")) -f3h.addStep(JTRegCheck(command=["make", "check-hotspot"], - description="check-hotspot", - workdir="build")) -f3h.addStep(JTRegCheck(command=["make", "check-langtools"], - description="check-langtools", - workdir="build")) - -#icedtea6-squeeze-x86_64-quick-jamvm -f3j = factory.BuildFactory() -f3j.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) -f3j.addStep(ShellCommand(command=["./autogen.sh"], - workdir="src", - description="autogen")) -f3j.addStep(ShellCommand(command=["rm", "-rf", "build"], - workdir=".", - description="clean build dir")) -f3j.addStep(Configure(command=["../src/configure", - "--disable-bootstrap", - "--disable-system-lcms", - "--disable-docs", - "--enable-jamvm"], - workdir="build")) -f3j.addStep(Compile(workdir="build")) -f3j.addStep(JTRegCheck(command=["make", "check-hotspot"], - description="check-hotspot", - workdir="build")) -f3j.addStep(JTRegCheck(command=["make", "check-langtools"], - description="check-langtools", - workdir="build")) - -#icedtea6-squeeze-x86_64-quick-cacao -f3c = factory.BuildFactory() -f3c.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) -f3c.addStep(ShellCommand(command=["./autogen.sh"], - workdir="src", - description="autogen")) -f3c.addStep(ShellCommand(command=["rm", "-rf", "build"], - workdir=".", - description="clean build dir")) -f3c.addStep(Configure(command=["../src/configure", - "--disable-bootstrap", - "--disable-system-lcms", - "--disable-docs", - "--enable-cacao"], - workdir="build")) -f3c.addStep(Compile(workdir="build")) -f3c.addStep(JTRegCheck(command=["make", "check-hotspot"], - description="check-hotspot", - workdir="build")) -f3c.addStep(JTRegCheck(command=["make", "check-langtools"], - description="check-langtools", - workdir="build")) - -#icedtea6-squeeze-x86_64-quick-shark -f3s = factory.BuildFactory() -f3s.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) -f3s.addStep(ShellCommand(command=["./autogen.sh"], - workdir="src", - description="autogen")) -f3s.addStep(ShellCommand(command=["rm", "-rf", "build"], - workdir=".", - description="clean build dir")) -f3s.addStep(Configure(command=["../src/configure", - "--disable-bootstrap", - "--disable-system-lcms", - "--disable-docs", - "--enable-shark"], - workdir="build")) -f3s.addStep(Compile(workdir="build")) -f3s.addStep(JTRegCheck(command=["make", "check-hotspot"], - description="check-hotspot", - workdir="build")) -f3s.addStep(JTRegCheck(command=["make", "check-langtools"], - description="check-langtools", - workdir="build")) - -f3an = factory.BuildFactory() -f3an.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) -f3an.addStep(ShellCommand(command=["./autogen.sh"], - workdir="src", - description="autogen")) -f3an.addStep(ShellCommand(command=["rm", "-rf", "build"], - workdir=".", - description="clean build dir")) -f3an.addStep(Configure(command=["../src/configure", - "--disable-bootstrap", - "--with-parallel-jobs=2", - "--disable-docs"], - workdir="build")) -f3an.addStep(Compile(workdir="build")) -f3an.addStep(JTRegCheck(command=["make", "check-hotspot"], - description="check-hotspot", - workdir="build")) -f3an.addStep(JTRegCheck(command=["make", "check-langtools"], - description="check-langtools", - workdir="build", timeout=2400)) -f3an.addStep(JTRegCheck(command=["make", "check-jdk"], - description="check-jdk", - workdir="build", timeout=7500)) -f3an.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"], - workdir=".", - flunkOnFailure=False, - alwaysRun=True, - description="killall")) +# Generic IcedTea # Default build factory that just does autogen, configure, make and make check fdefault = factory.BuildFactory() @@ -457,6 +295,7 @@ flunkOnFailure=False, alwaysRun=True, description="killall")) +# Default build factory that just does autogen, configure, make and make check with no docs fnodocs = factory.BuildFactory() fnodocs.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) fnodocs.addStep(ShellCommand(command=["./autogen.sh"], workdir="src", @@ -475,37 +314,118 @@ flunkOnFailure=False, alwaysRun=True, description="killall")) -f3an7 = factory.BuildFactory() -f3an7.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) -f3an7.addStep(ShellCommand(command=["./autogen.sh"], +# Generic quick squeeze armv5tel +f3a5 = factory.BuildFactory() +f3a5.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) +f3a5.addStep(ShellCommand(command=["./autogen.sh"], workdir="src", description="autogen")) -f3an7.addStep(ShellCommand(command=["rm", "-rf", "build"], +f3a5.addStep(ShellCommand(command=["rm", "-rf", "build"], workdir=".", description="clean build dir")) -f3an7.addStep(Configure(command=["../src/configure", +f3a5.addStep(Configure(command=["../src/configure", "--disable-bootstrap", - "--with-parallel-jobs=2", + "--with-parallel-jobs=1", "--disable-docs", + "--disable-system-gio", + "--disable-system-gtk", "--disable-system-lcms"], workdir="build")) -f3an7.addStep(Compile(workdir="build")) -f3an7.addStep(JTRegCheck(command=["make", "check-hotspot"], +f3a5.addStep(Compile(workdir="build")) +f3a5.addStep(JTRegCheck(command=["make", "check-hotspot"], description="check-hotspot", workdir="build")) -f3an7.addStep(JTRegCheck(command=["make", "check-langtools"], +f3a5.addStep(JTRegCheck(command=["make", "check-langtools"], description="check-langtools", workdir="build", timeout=2400)) -f3an7.addStep(JTRegCheck(command=["make", "check-jdk"], +f3a5.addStep(JTRegCheck(command=["make", "check-jdk"], description="check-jdk", workdir="build", timeout=7500)) -f3an7.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"], +f3a5.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"], workdir=".", flunkOnFailure=False, alwaysRun=True, description="killall")) +# IcedTea6 +#icedtea6-wheezy-x86_64-quick +f3q6 = factory.BuildFactory() +f3q6.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) +f3q6.addStep(ShellCommand(command=["./autogen.sh"], + workdir="src", + description="autogen")) +f3q6.addStep(ShellCommand(command=["rm", "-rf", "build"], + workdir=".", + description="clean build dir")) +f3q6.addStep(Configure(command=["../src/configure", + "--disable-bootstrap", + "--disable-system-lcms", + "--disable-docs", + "--with-additional-vms=jamvm,cacao,zero", + "--with-parallel-jobs=4"], + workdir="build")) +f3q6.addStep(Compile(workdir="build")) +f3q6.addStep(JTRegCheck(command=["make", "check-hotspot"], + description="check-hotspot", + workdir="build")) +f3q6.addStep(JTRegCheck(command=["make", "check-langtools"], + description="check-langtools", + workdir="build")) + +#icedtea6-squeeze-x86_64-quick-shark +f3s6 = factory.BuildFactory() +f3s6.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) +f3s6.addStep(ShellCommand(command=["./autogen.sh"], + workdir="src", + description="autogen")) +f3s6.addStep(ShellCommand(command=["rm", "-rf", "build"], + workdir=".", + description="clean build dir")) +f3s6.addStep(Configure(command=["../src/configure", + "--disable-system-lcms", + "--disable-docs", + "--enable-shark"], + workdir="build")) +f3s6.addStep(Compile(workdir="build")) +f3s6.addStep(JTRegCheck(command=["make", "check-hotspot"], + description="check-hotspot", + workdir="build")) +f3s6.addStep(JTRegCheck(command=["make", "check-langtools"], + description="check-langtools", + workdir="build")) + +# icedtea6-natty-armv7l-quick +f3an6 = factory.BuildFactory() +f3an6.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) +f3an6.addStep(ShellCommand(command=["./autogen.sh"], + workdir="src", + description="autogen")) +f3an6.addStep(ShellCommand(command=["rm", "-rf", "build"], + workdir=".", + description="clean build dir")) +f3an6.addStep(Configure(command=["../src/configure", + "--disable-bootstrap", + "--with-parallel-jobs=2", + "--disable-docs"], + workdir="build")) +f3an6.addStep(Compile(workdir="build")) +f3an6.addStep(JTRegCheck(command=["make", "check-hotspot"], + description="check-hotspot", + workdir="build")) +f3an6.addStep(JTRegCheck(command=["make", "check-langtools"], + description="check-langtools", + workdir="build", timeout=2400)) +f3an6.addStep(JTRegCheck(command=["make", "check-jdk"], + description="check-jdk", + workdir="build", timeout=7500)) +f3an6.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"], + workdir=".", + flunkOnFailure=False, + alwaysRun=True, + description="killall")) + +# icedtea6-natty-armv7l-quick-cacao f3anc = factory.BuildFactory() f3anc.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) f3anc.addStep(ShellCommand(command=["./autogen.sh"], @@ -536,7 +456,7 @@ alwaysRun=True, description="killall")) - +# icedtea6-natty-armv7l-quick-jamvm f3anj = factory.BuildFactory() f3anj.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) f3anj.addStep(ShellCommand(command=["./autogen.sh"], @@ -567,7 +487,7 @@ alwaysRun=True, description="killall")) - +# icedtea6-natty-armv7l-quick-shark f3ans = factory.BuildFactory() f3ans.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) f3ans.addStep(ShellCommand(command=["./autogen.sh"], @@ -598,39 +518,6 @@ alwaysRun=True, description="killall")) -#icedtea6-lucid-ia32-quick-zero -f3lz = factory.BuildFactory() -f3lz.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) -f3lz.addStep(ShellCommand(command=["./autogen.sh"], - workdir="src", - description="autogen")) -f3lz.addStep(ShellCommand(command=["rm", "-rf", "build"], - workdir=".", - description="clean build dir")) -f3lz.addStep(Configure(command=["../src/configure", - "--disable-bootstrap", - "--with-parallel-jobs=5", - "--disable-system-lcms", - "--disable-docs", - "--with-hotspot-build", - "--enable-zero"], - workdir="build")) -f3lz.addStep(Compile(workdir="build")) -f3lz.addStep(JTRegCheck(command=["make", "check-hotspot"], - description="check-hotspot", - workdir="build")) -f3lz.addStep(JTRegCheck(command=["make", "check-langtools"], - description="check-langtools", - workdir="build", timeout=2400)) -f3lz.addStep(JTRegCheck(command=["make", "check-jdk"], - description="check-jdk", - workdir="build", timeout=7500)) -f3lz.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"], - workdir=".", - flunkOnFailure=False, - alwaysRun=True, - description="killall")) - #icedtea6-lucid-ia32-quick-shark f3ls = factory.BuildFactory() f3ls.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) @@ -729,39 +616,39 @@ alwaysRun=True, description="killall")) -f3a5 = factory.BuildFactory() -f3a5.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) -f3a5.addStep(ShellCommand(command=["./autogen.sh"], +#icedtea6-lucid-ia32-quick-zero +f3lz = factory.BuildFactory() +f3lz.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) +f3lz.addStep(ShellCommand(command=["./autogen.sh"], workdir="src", description="autogen")) -f3a5.addStep(ShellCommand(command=["rm", "-rf", "build"], +f3lz.addStep(ShellCommand(command=["rm", "-rf", "build"], workdir=".", description="clean build dir")) -f3a5.addStep(Configure(command=["../src/configure", +f3lz.addStep(Configure(command=["../src/configure", "--disable-bootstrap", - "--with-parallel-jobs=1", + "--with-parallel-jobs=5", + "--disable-system-lcms", "--disable-docs", - "--disable-system-gio", - "--disable-system-gtk", - "--disable-system-lcms"], + "--with-hotspot-build", + "--enable-zero"], workdir="build")) -f3a5.addStep(Compile(workdir="build")) -f3a5.addStep(JTRegCheck(command=["make", "check-hotspot"], +f3lz.addStep(Compile(workdir="build")) +f3lz.addStep(JTRegCheck(command=["make", "check-hotspot"], description="check-hotspot", workdir="build")) -f3a5.addStep(JTRegCheck(command=["make", "check-langtools"], +f3lz.addStep(JTRegCheck(command=["make", "check-langtools"], description="check-langtools", workdir="build", timeout=2400)) -f3a5.addStep(JTRegCheck(command=["make", "check-jdk"], +f3lz.addStep(JTRegCheck(command=["make", "check-jdk"], description="check-jdk", workdir="build", timeout=7500)) -f3a5.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"], +f3lz.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"], workdir=".", flunkOnFailure=False, alwaysRun=True, description="killall")) - #icedtea6-squeeze-armv5tel-quick-cacao f3a5c = factory.BuildFactory() f3a5c.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) @@ -861,43 +748,184 @@ alwaysRun=True, description="killall")) +# IcedTea7 -icedtea6_builder_quick = { 'name': "icedtea6-squeeze-x86_64-quick", +#icedtea7-wheezy-x86_64-quick +f3q7 = factory.BuildFactory() +f3q7.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) +f3q7.addStep(ShellCommand(command=["./autogen.sh"], + workdir="src", + description="autogen")) +f3q7.addStep(ShellCommand(command=["rm", "-rf", "build"], + workdir=".", + description="clean build dir")) +f3q7.addStep(Configure(command=["../src/configure", + "--disable-bootstrap", + "--disable-docs", + "--with-additional-vms=jamvm,cacao,zero", + "--with-parallel-jobs=4", + "--disable-system-lcms"], + workdir="build")) +f3q7.addStep(Compile(workdir="build")) +f3q7.addStep(JTRegCheck(command=["make", "check-hotspot"], + description="check-hotspot", + workdir="build")) +f3q7.addStep(JTRegCheck(command=["make", "check-langtools"], + description="check-langtools", + workdir="build")) + +#icedtea7-wheezy-x86_64-shark +f3s7 = factory.BuildFactory() +f3s7.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) +f3s7.addStep(ShellCommand(command=["./autogen.sh"], + workdir="src", + description="autogen")) +f3s7.addStep(ShellCommand(command=["rm", "-rf", "build"], + workdir=".", + description="clean build dir")) +f3s7.addStep(Configure(command=["../src/configure", + "--enable-shark", + "--disable-docs", + "--with-parallel-jobs=4", + "--disable-system-lcms"], + workdir="build")) +f3s7.addStep(Compile(workdir="build")) +f3s7.addStep(JTRegCheck(command=["make", "check-hotspot"], + description="check-hotspot", + workdir="build")) +f3s7.addStep(JTRegCheck(command=["make", "check-langtools"], + description="check-langtools", + workdir="build")) + +# icedtea7-natty-armv7l-quick +f3an7 = factory.BuildFactory() +f3an7.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) +f3an7.addStep(ShellCommand(command=["./autogen.sh"], + workdir="src", + description="autogen")) +f3an7.addStep(ShellCommand(command=["rm", "-rf", "build"], + workdir=".", + description="clean build dir")) +f3an7.addStep(Configure(command=["../src/configure", + "--disable-bootstrap", + "--with-parallel-jobs=2", + "--disable-docs", + "--disable-system-lcms"], + workdir="build")) +f3an7.addStep(Compile(workdir="build")) +f3an7.addStep(JTRegCheck(command=["make", "check-hotspot"], + description="check-hotspot", + workdir="build")) +f3an7.addStep(JTRegCheck(command=["make", "check-langtools"], + description="check-langtools", + workdir="build", timeout=2400)) +f3an7.addStep(JTRegCheck(command=["make", "check-jdk"], + description="check-jdk", + workdir="build", timeout=7500)) +f3an7.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"], + workdir=".", + flunkOnFailure=False, + alwaysRun=True, + description="killall")) + +# IcedTea8 + +#icedtea8-wheezy-x86_64-quick +f3q8 = factory.BuildFactory() +f3q8.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) +f3q8.addStep(ShellCommand(command=["./autogen.sh"], + workdir="src", + description="autogen")) +f3q8.addStep(ShellCommand(command=["rm", "-rf", "build"], + workdir=".", + description="clean build dir")) +f3q8.addStep(Configure(command=["../src/configure", + "--disable-bootstrap", + "--disable-docs", + "--with-additional-vms=jamvm,cacao,zero", + "--with-parallel-jobs=4", + "--disable-system-lcms"], + workdir="build")) +f3q8.addStep(Compile(workdir="build")) +f3q8.addStep(JTRegCheck(command=["make", "check-hotspot"], + description="check-hotspot", + workdir="build")) +f3q8.addStep(JTRegCheck(command=["make", "check-langtools"], + description="check-langtools", + workdir="build")) + +#icedtea8-wheezy-x86_64-shark +f3s8 = factory.BuildFactory() +f3s8.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) +f3s8.addStep(ShellCommand(command=["./autogen.sh"], + workdir="src", + description="autogen")) +f3s8.addStep(ShellCommand(command=["rm", "-rf", "build"], + workdir=".", + description="clean build dir")) +f3s8.addStep(Configure(command=["../src/configure", + "--enable-shark", + "--disable-docs", + "--with-parallel-jobs=4", + "--disable-system-lcms"], + workdir="build")) +f3s8.addStep(Compile(workdir="build")) +f3s8.addStep(JTRegCheck(command=["make", "check-hotspot"], + description="check-hotspot", + workdir="build")) +f3s8.addStep(JTRegCheck(command=["make", "check-langtools"], + description="check-langtools", + workdir="build")) + +# icedtea8-natty-armv7l-quick +f3an8 = factory.BuildFactory() +f3an8.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) +f3an8.addStep(ShellCommand(command=["./autogen.sh"], + workdir="src", + description="autogen")) +f3an8.addStep(ShellCommand(command=["rm", "-rf", "build"], + workdir=".", + description="clean build dir")) +f3an8.addStep(Configure(command=["../src/configure", + "--disable-bootstrap", + "--with-parallel-jobs=2", + "--disable-docs", + "--disable-system-lcms"], + workdir="build")) +f3an8.addStep(Compile(workdir="build")) +f3an8.addStep(JTRegCheck(command=["make", "check-hotspot"], + description="check-hotspot", + workdir="build")) +f3an8.addStep(JTRegCheck(command=["make", "check-langtools"], + description="check-langtools", + workdir="build", timeout=2400)) +f3an8.addStep(JTRegCheck(command=["make", "check-jdk"], + description="check-jdk", + workdir="build", timeout=8500)) +f3an8.addStep(ShellCommand(command=["killall", "-q", "-v", "-s", "KILL", "java"], + workdir=".", + flunkOnFailure=False, + alwaysRun=True, + description="killall")) + +# IcedTea6 +icedtea6_builder_quick = { 'name': "icedtea6-wheezy-x86_64-quick", 'slavenames': ["squeeze-x86_64"], 'builddir': "icedtea6-quick", - 'factory': f3s6 } -icedtea6_builder_quick_hotspot = { - 'name': "icedtea6-squeeze-x86_64-quick-hotspot", - 'slavenames': ["squeeze-x86_64"], - 'builddir': "icedtea6-quick-hotspot", - 'factory': f3h } -icedtea6_builder_quick_jamvm = { - 'name': "icedtea6-squeeze-x86_64-quick-jamvm", + 'factory': f3q6 } +icedtea6_builder_shark = { + 'name': "icedtea6-wheezy-x86_64-shark", 'slavenames': ["squeeze-x86_64"], - 'builddir': "icedtea6-quick-jamvm", - 'factory': f3j } -icedtea6_builder_quick_cacao = { - 'name': "icedtea6-squeeze-x86_64-quick-cacao", - 'slavenames': ["squeeze-x86_64"], - 'builddir': "icedtea6-quick-cacao", - 'factory': f3c } -icedtea6_builder_quick_shark = { - 'name': "icedtea6-squeeze-x86_64-quick-shark", - 'slavenames': ["squeeze-x86_64"], - 'builddir': "icedtea6-quick-shark", - 'factory': f3s } + 'builddir': "icedtea6-shark", + 'factory': f3s6 } icedtea6_builder_f16_x86 = { 'name': "icedtea6-f16-x86", 'slavenames': ["fedora16-x86"], 'builddir': "icedtea6-f16-x86", 'factory': fnodocs } -icedtea7_builder_f16_x86 = { 'name': "icedtea7-f16-x86", - 'slavenames': ["fedora16-x86"], - 'builddir': "icedtea7-f16-x86", - 'factory': fnodocs } icedtea6_builder_quick_arm_natty = { 'name': "icedtea6-natty-armv7l-quick", 'slavenames': ["natty-armv7l"], 'builddir': "icedtea6-natty-armv7l-quick", - 'factory': f3an } + 'factory': f3an6 } icedtea6_builder_quick_arm_natty_cacao = { 'name': "icedtea6-natty-armv7l-quick-cacao", 'slavenames': ["natty-armv7l"], @@ -938,11 +966,6 @@ '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", "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", "bot2-armv5tel", "bot3-armv5tel"], @@ -953,10 +976,25 @@ 'slavenames': ["squeeze-armv5tel", "bot2-armv5tel", "bot3-armv5tel"], 'builddir': "icedtea6-squeeze-armv5tel-quick-jamvm", 'factory': f3a5j } -icedtea7_builder_quick = { 'name': "icedtea7-squeeze-x86_64-quick", +icedtea6_builder_quick_armv5tel_squeeze_shark = { + 'name': "icedtea6-squeeze-armv5tel-quick-shark", + 'slavenames': ["squeeze-armv5tel", "bot2-armv5tel", "bot3-armv5tel"], + 'builddir': "icedtea6-squeeze-armv5tel-quick-shark", + 'factory': f3a5s } + +# IcedTea7 +icedtea7_builder_quick = { 'name': "icedtea7-wheezy-x86_64-quick", 'slavenames': ["squeeze-x86_64"], 'builddir': "icedtea7-quick", + 'factory': f3q7 } +icedtea7_builder_shark = { 'name': "icedtea7-wheezy-x86_64-shark", + 'slavenames': ["squeeze-x86_64"], + 'builddir': "icedtea7-shark", 'factory': f3s7 } +icedtea7_builder_f16_x86 = { 'name': "icedtea7-f16-x86", + 'slavenames': ["fedora16-x86"], + 'builddir': "icedtea7-f16-x86", + 'factory': fnodocs } icedtea7_builder_quick_armv5tel_squeeze = { 'name': "icedtea7-squeeze-armv5tel-quick", 'slavenames': ["squeeze-armv5tel", "bot2-armv5tel", "bot3-armv5tel"], @@ -966,6 +1004,31 @@ 'slavenames': ["natty-armv7l"], 'builddir': "icedtea7-natty-armv7l-quick", 'factory': f3an7 } +# IcedTea8 +icedtea8_builder_quick = { 'name': "icedtea8-wheezy-x86_64-quick", + 'slavenames': ["squeeze-x86_64"], + 'builddir': "icedtea7-quick", + 'factory': f3q8 } +icedtea8_builder_shark = { + 'name': "icedtea8-wheezy-x86_64-shark", + 'slavenames': ["squeeze-x86_64"], + 'builddir': "icedtea7-shark", + 'factory': f3s8 } +icedtea8_builder_f16_x86 = { 'name': "icedtea8-f16-x86", + 'slavenames': ["fedora16-x86"], + 'builddir': "icedtea8-f16-x86", + 'factory': fnodocs } +icedtea8_builder_quick_armv5tel_squeeze = { + 'name': "icedtea8-squeeze-armv5tel-quick", + 'slavenames': ["squeeze-armv5tel", "bot2-armv5tel", "bot3-armv5tel"], + 'builddir': "icedtea8-squeeze-armv5tel-quick", + 'factory': f3a5 } +icedtea8_builder_quick_arm_natty = { 'name': "icedtea8-natty-armv7l-quick", + 'slavenames': ["natty-armv7l"], + 'builddir': "icedtea8-natty-armv7l-quick", + 'factory': f3an8 } + +# Full build f4 = factory.BuildFactory() f4.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update")) @@ -980,11 +1043,7 @@ "--enable-optimizations", "--enable-docs", "--enable-nss", - "--with-additional-vms=shark", "--with-parallel-jobs=4", - "--with-llvm-config=llvm-config-2.7", - "--disable-system-gio", - "--disable-system-gtk", "--disable-system-lcms"], workdir="build")) f4.addStep(Compile(workdir="build")) @@ -998,20 +1057,21 @@ description="check-jdk", workdir="build", timeout=7500)) -icedtea6_builder_full = { 'name': "icedtea6-squeeze-x86_64-full", +icedtea6_builder_full = { 'name': "icedtea6-wheezy-x86_64-full", 'slavenames': ["squeeze-x86_64"], 'builddir': "icedtea6-full", 'factory': f4 } -icedtea7_builder_full = { 'name': "icedtea7-squeeze-x86_64-full", +icedtea7_builder_full = { 'name': "icedtea7-wheezy-x86_64-full", 'slavenames': ["squeeze-x86_64"], 'builddir': "icedtea7-full", 'factory': f4 } +icedtea8_builder_full = { 'name': "icedtea8-wheezy-x86_64-full", + 'slavenames': ["squeeze-x86_64"], + 'builddir': "icedtea8-full", + 'factory': f4 } c['builders'] = [icedtea6_builder_quick, - icedtea6_builder_quick_hotspot, - icedtea6_builder_quick_jamvm, - icedtea6_builder_quick_cacao, - icedtea6_builder_quick_shark, + icedtea6_builder_shark, icedtea6_builder_f16_x86, icedtea6_builder_quick_arm_natty, icedtea6_builder_quick_arm_natty_cacao, @@ -1026,11 +1086,18 @@ icedtea6_builder_quick_armv5tel_squeeze_jamvm, icedtea6_builder_quick_armv5tel_squeeze_shark, icedtea7_builder_quick, + icedtea7_builder_shark, icedtea7_builder_f16_x86, icedtea7_builder_quick_armv5tel_squeeze, icedtea7_builder_quick_arm_natty, + icedtea8_builder_quick, + icedtea8_builder_shark, + icedtea8_builder_f16_x86, + icedtea8_builder_quick_armv5tel_squeeze, + icedtea8_builder_quick_arm_natty, icedtea6_builder_full, icedtea7_builder_full, + icedtea8_builder_full, icedtea_web_builder_x86_64, icedtea_web_builder_f16_x86, icedtea_web_builder_squeeze_armv5tel,