http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73838
Revision: 73838
Author: pdhanda
Date: 2010-09-27 23:41:52 +0000 (Mon, 27 Sep 2010)
Log Message:
-----------
updated to what's currently running on ci.tesla
Modified Paths:
--------------
trunk/test-server/cc-home/config.xml
trunk/test-server/cc-home/projects/mw/build.xml
Modified: trunk/test-server/cc-home/config.xml
===================================================================
--- trunk/test-server/cc-home/config.xml 2010-09-27 23:37:03 UTC (rev
73837)
+++ trunk/test-server/cc-home/config.xml 2010-09-27 23:41:52 UTC (rev
73838)
@@ -1,56 +1,58 @@
-<?xml version="1.0"?>
-<cruisecontrol>
- <project name="mw">
- <plugin name="svnbootstrapper"
-
classname="net.sourceforge.cruisecontrol.bootstrappers.SVNBootstrapper"/>
- <plugin name="svn"
classname="net.sourceforge.cruisecontrol.sourcecontrols.SVN"/>
- <listeners>
- <currentbuildstatuslistener file="logs/${project.name}/status.txt"/>
- </listeners>
- <bootstrappers>
- <antbootstrapper anthome="apache-ant-1.7.0"
- buildfile="projects/${project.name}/build.xml"
target="clean"/>
- </bootstrappers>
- <modificationset quietperiod="300">
- <!-- touch any file in connectfour project to trigger a build -->
- <filesystem folder="projects/${project.name}/touchme"/>
- <svn
RepositoryLocation="http://svn.wikimedia.org/svnroot/mediawiki/trunk/phase3"/>
- </modificationset>
- <schedule interval="3600">
- <ant anthome="apache-ant-1.7.0"
buildfile="projects/${project.name}/build.xml"/>
- </schedule>
- <log>
- <merge dir="projects/${project.name}/build/logs"/>
- <delete every="1" unit="WEEK" />
- <gzip every="1" unit="DAY" />
- <deleteartifacts every="1" unit="day" />
- </log>
- <publishers>
- <artifactspublisher dir="projects/${project.name}/build/api"
- dest="artifacts/${project.name}" subdirectory="api"/>
- <artifactspublisher dir="projects/${project.name}/build/coverage"
- dest="artifacts/${project.name}"
subdirectory="coverage"/>
- <execute command="phpcb --log projects/${project.name}/build/logs
- --source projects/${project.name}/source
- --output
projects/${project.name}/build/${project.name}"/>
- <!-- <artifactspublisher
dir="projects/${project.name}/build/php-code-browser"
dest="artifacts/${project.name}" subdirectory="php-code-browser"/> -->
- <!-- <execute command="/usr/bin/phpuc graph logs/${project.name}
artifacts/${project.name}"/> -->
- <!--
- Sends simple text emails after a project build. For nicer html
emails,
- checkout the original CruiseControl documentation.
-
-* http://cruisecontrol.sourceforge.net/main/configxml.html#email
-* http://cruisecontrol.sourceforge.net/main/configxml.html#htmlemail
- -->
- <email mailhost="localhost"
- returnaddress="[email protected]"
-
buildresultsurl="http://ci.tesla.usability.wikimedia.org:8080/cruisecontrol/buildresults/${project.name}";
- skipusers="true" spamwhilebroken="true">
- <failure address="[email protected]"/>
- </email>
- <antpublisher anthome="apache-ant-1.7.0"
- buildfile="projects/${project.name}/build.xml"
- target="irc-publish"/>
- </publishers>
- </project>
-</cruisecontrol>
+<?xml version="1.0"?>
+<cruisecontrol>
+ <project name="mw">
+ <plugin name="svnbootstrapper"
+
classname="net.sourceforge.cruisecontrol.bootstrappers.SVNBootstrapper"/>
+ <plugin name="svn"
classname="net.sourceforge.cruisecontrol.sourcecontrols.SVN"/>
+ <listeners>
+ <currentbuildstatuslistener file="logs/${project.name}/status.txt"/>
+ </listeners>
+ <bootstrappers>
+ <antbootstrapper anthome="apache-ant-1.7.0"
+ buildfile="projects/${project.name}/build.xml"
target="clean"/>
+ </bootstrappers>
+ <modificationset quietperiod="300">
+ <!-- touch any file in connectfour project to trigger a build -->
+ <filesystem folder="projects/${project.name}/touchme"/>
+ <svn
RepositoryLocation="http://svn.wikimedia.org/svnroot/mediawiki/trunk/phase3"/>
+ </modificationset>
+ <schedule interval="3600">
+ <ant anthome="apache-ant-1.7.0"
buildfile="projects/${project.name}/build.xml"/>
+ </schedule>
+ <log>
+ <merge dir="projects/${project.name}/build/logs"/>
+ <delete every="1" unit="WEEK" />
+ <gzip every="1" unit="DAY" />
+ <deleteartifacts every="1" unit="DAY" />
+ </log>
+ <publishers>
+ <!-- disable this till we write a script to delete old artifacts. It
takes up too much disk space per build.
+ <onsuccess>
+ <artifactspublisher dir="projects/${project.name}/build/api"
+ dest="artifacts/${project.name}" subdirectory="api"/>
+ <artifactspublisher dir="projects/${project.name}/build/coverage"
+ dest="artifacts/${project.name}"
subdirectory="coverage"/>
+ <artifactspublisher
dir="projects/${project.name}/build/php-code-browser"
dest="artifacts/${project.name}" subdirectory="php-code-browser"/>
+ </onsuccess>
+ -->
+
+ <!-- <execute command="/usr/bin/phpuc graph logs/${project.name}
artifacts/${project.name}"/> -->
+ <!--
+ Sends simple text emails after a project build. For nicer html
emails,
+ checkout the original CruiseControl documentation.
+
+* http://cruisecontrol.sourceforge.net/main/configxml.html#email
+* http://cruisecontrol.sourceforge.net/main/configxml.html#htmlemail
+ -->
+ <email mailhost="localhost"
+ returnaddress="[email protected]"
+
buildresultsurl="http://ci.tesla.usability.wikimedia.org:8080/cruisecontrol/buildresults/${project.name}";
+ skipusers="true" spamwhilebroken="true">
+ <failure address="[email protected]"/>
+ </email>
+ <antpublisher anthome="apache-ant-1.7.0"
+ buildfile="projects/${project.name}/build.xml"
+ target="irc-publish"/>
+ </publishers>
+ </project>
+</cruisecontrol>
Modified: trunk/test-server/cc-home/projects/mw/build.xml
===================================================================
--- trunk/test-server/cc-home/projects/mw/build.xml 2010-09-27 23:37:03 UTC
(rev 73837)
+++ trunk/test-server/cc-home/projects/mw/build.xml 2010-09-27 23:41:52 UTC
(rev 73838)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="phpundercontrol.org" default="build" basedir=".">
- <target name="build" depends="uptodate,init,test-static,apidoc,phpunit" />
+ <target name="build" depends="uptodate,init,apidoc,phpunit" />
<property file="build.properties"/>
<!--
@@ -57,13 +57,9 @@
</target>
<target name="test-static" depends="prepare">
- <parallel>
- <antcall target="lint" />
- <!-- <antcall target="checkstyle" /> -->
- </parallel>
- <!-- Took this out of the parallel run b/c of memory requirements -->
- <!-- <antcall target="phpmd" /> -->
- <!-- Do not run phpmd and pdepend parallel, there is a concurrency problem
-->
+ <antcall target="lint" />
+ <antcall target="checkstyle" />
+ <antcall target="phpcb" />
<!-- <antcall target="pdepend" /> -->
</target>
@@ -124,14 +120,14 @@
</target>
<target name="phpunit" depends="prepare">
- <exec executable="./phpunit" dir="${sourcedir}/maintenance/tests"
failonerror="true">
- <arg line="--log-junit ${builddir}/logs/junit.xml --coverage-clover
${builddir}/logs/phpunit.coverage.xml --coverage-html ${builddir}/coverage" />
+ <exec executable="phpunit" dir="${sourcedir}/maintenance/tests/phpunit"
failonerror="true">
+ <arg line="--configuration suite.xml --log-junit
${builddir}/logs/junit.xml --coverage-clover
${builddir}/logs/phpunit.coverage.xml --coverage-html ${builddir}/coverage" />
</exec>
</target>
<target name="phpcb">
<exec executable="phpcb" dir="${sourcedir}">
- <arg line="--log ${builddir}/logs --output
${builddir}/php-code-browser"/>
+ <arg line="--log ${builddir}/logs --source ${sourcedir} --output
${builddir}/php-code-browser"/>
</exec>
</target>
@@ -160,4 +156,4 @@
</xslt>
</target>
-</project>
\ No newline at end of file
+</project>
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
