Author: ben
Date: 2006-11-13 12:10:28 -0800 (Mon, 13 Nov 2006)
New Revision: 2507
Modified:
tools/trunk/build-tools/nightly/build.xml
tools/trunk/build-tools/nightly/nightly-go.sh
Log:
This is the nightly build scripts that we've been using for a few weeks. It
invokes megatest on legals, doesn't invoke megatest on trunk, and deploys
succesful builds. However, it displays OBI-45: build logs don't say BUILD
SUCCESSFUL.
Modified: tools/trunk/build-tools/nightly/build.xml
===================================================================
--- tools/trunk/build-tools/nightly/build.xml 2006-11-13 18:40:40 UTC (rev
2506)
+++ tools/trunk/build-tools/nightly/build.xml 2006-11-13 20:10:28 UTC (rev
2507)
@@ -132,7 +132,6 @@
<ant target="push-to-children" />
<ant target="make-download-dest-dir" />
<ant target="build" />
- <ant target="lztest" />
<ant target="push-to-download"/>
</target>
@@ -150,8 +149,8 @@
<property name="path.tag"
value="http://svn.openlaszlo.org/${build.project}/builds/${build.name}"; />
- <!-- Enable running lztest if we're in the legals branch -->
- <condition property="should.run.lztest">
+ <!-- Enable running megatest if we're in the legals branch -->
+ <condition property="should.run.megatest">
<equals arg1="${build.branch}" arg2="branches/legals" />
</condition>
@@ -245,15 +244,16 @@
</ant>
</target>
- <target name="lztest"
- if="should.run.lztest"
+ <target name="megatest"
+ if="should.run.megatest"
depends="init">
- <echo message="Stating lztest." />
- <ant dir="${tmp.dir}/${build.name}" target="lztest" inheritAll="false">
+ <echo message="Stating megatest with build root dir going to be
${tmp.dir}/${build.name}" />
+ <ant dir="${tmp.dir}/${build.name}" target="megatest"
inheritAll="false">
<property name="LPS_HOME" value="${tmp.dir}/${build.name}" />
<property name="ANT_HOME" value="${env.ANT_HOME}" />
+ <property name="should.run.megatest" value="true" />
</ant>
- <echo message="Done with lztest." />
+ <echo message="Done with megatest." />
</target>
Modified: tools/trunk/build-tools/nightly/nightly-go.sh
===================================================================
--- tools/trunk/build-tools/nightly/nightly-go.sh 2006-11-13 18:40:40 UTC
(rev 2506)
+++ tools/trunk/build-tools/nightly/nightly-go.sh 2006-11-13 20:10:28 UTC
(rev 2507)
@@ -24,9 +24,11 @@
lpsversion="3.4.x"
contextpath="/trunk-nightly"
+testtask="lztest"
if [ ${branchmunge} = "branches-legals" ] ; then
lpsversion="4.0.x"
contextpath="/legals-nightly"
+ testtask="megatest"
fi
echo "Using $lpsversion as lpsversion and $contextpath as deployment
contextpath"
@@ -35,7 +37,7 @@
$ANT_HOME/bin/ant -Dbuild.revision=${buildnum}
-Dbuild.mail.subject="${subject}" -Dbuild.mail.message="Building target init"
enable-mail-report send-mail-start
echo "Now actually starting the build at `date`"
-$ANT_HOME/bin/ant -v -Dtomcat.host=labs.openlaszlo.org -Dtomcat.port=9080
-Dtomcat.contextpath=${contextpath}
-Dtomcat.home=/home/laszlo/jakarta-tomcat-5.0.28-labs -Ddeploy.user=laszlo
-Ddeploy.destparentdir=/home/laszlo/public_html/labs
-Dbuild.revision=${buildnum} -Dbuild.branch=${branch}
-Dbuild.version=${lpsversion} -Dbuild.target=dist-one enable-linux-build
enable-mac-build enable-windows-build enable-deploy enable-post-to-download
nightly undeploy push-to-deploy deploy >
~/logs/${buildnum}-${branchmunge}-nightly.log
+$ANT_HOME/bin/ant -Dtomcat.host=labs.openlaszlo.org -Dtomcat.port=9080
-Dtomcat.contextpath=${contextpath}
-Dtomcat.home=/home/laszlo/jakarta-tomcat-5.0.28-labs -Ddeploy.user=laszlo
-Ddeploy.destparentdir=/home/laszlo/public_html/labs
-Dbuild.revision=${buildnum} -Dbuild.branch=${branch}
-Dbuild.version=${lpsversion} -Dbuild.target=dist-one enable-linux-build
enable-mac-build enable-windows-build enable-deploy enable-post-to-download
nightly $testtask undeploy push-to-deploy deploy | tee
~/logs/${buildnum}-${branchmunge}-nightly.log
# Report on the build's results, and append the last 200 lines of the build
file.
if [ $? = 0 ] ; then
@@ -49,4 +51,4 @@
tail -100 ~/logs/${buildnum}-${branchmunge}-nightly.log >
~/logs/tail-${buildnum}-${branchmunge}-nightly.log
$ANT_HOME/bin/ant -Dbuild.revision=${buildnum} -Dbuild.branch=${branch}
-Dbuild.mail.subject="${subject}" -Dbuild.mail.message="${msg}"
enable-mail-report send-mail-complete
-# TODO: cleanup tarball from deployment machine
\ No newline at end of file
+# TODO: cleanup tarball from deployment machine
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
