| Index: trunk/test-server/cc-home/config.xml |
| — | — | @@ -1,53 +1,56 @@ |
| 2 | | -<?xml version="1.0"?>
|
| 3 | | -<cruisecontrol>
|
| 4 | | - <project name="mw">
|
| 5 | | - <plugin name="svnbootstrapper"
|
| 6 | | - classname="net.sourceforge.cruisecontrol.bootstrappers.SVNBootstrapper"/>
|
| 7 | | - <plugin name="svn" classname="net.sourceforge.cruisecontrol.sourcecontrols.SVN"/>
|
| 8 | | - <listeners>
|
| 9 | | - <currentbuildstatuslistener file="logs/${project.name}/status.txt"/>
|
| 10 | | - </listeners>
|
| 11 | | - <bootstrappers>
|
| 12 | | - <antbootstrapper anthome="apache-ant-1.7.0"
|
| 13 | | - buildfile="projects/${project.name}/build.xml" target="clean"/>
|
| 14 | | - </bootstrappers>
|
| 15 | | - <modificationset quietperiod="60">
|
| 16 | | - <!-- touch any file in connectfour project to trigger a build -->
|
| 17 | | - <filesystem folder="projects/${project.name}/touchme"/>
|
| 18 | | - <svn RepositoryLocation="http://svn.wikimedia.org/svnroot/mediawiki/trunk/phase3"/>
|
| 19 | | - </modificationset>
|
| 20 | | - <schedule interval="300">
|
| 21 | | - <ant anthome="apache-ant-1.7.0" buildfile="projects/${project.name}/build.xml"/>
|
| 22 | | - </schedule>
|
| 23 | | - <log>
|
| 24 | | - <merge dir="projects/${project.name}/build/logs"/>
|
| 25 | | - </log>
|
| 26 | | - <publishers>
|
| 27 | | - <antpublisher anthome="apache-ant-1.7.0"
|
| 28 | | - buildfile="projects/${project.name}/build.xml"
|
| 29 | | - target="irc-publish"/>
|
| 30 | | - <artifactspublisher dir="projects/${project.name}/build/api"
|
| 31 | | - dest="artifacts/${project.name}" subdirectory="api"/>
|
| 32 | | - <artifactspublisher dir="projects/${project.name}/build/coverage"
|
| 33 | | - dest="artifacts/${project.name}" subdirectory="coverage"/>
|
| 34 | | - <execute command="phpcb --log projects/${project.name}/build/logs
|
| 35 | | - --source projects/${project.name}/source
|
| 36 | | - --output projects/${project.name}/build/${project.name}"/>
|
| 37 | | - <!-- <artifactspublisher dir="projects/${project.name}/build/php-code-browser" dest="artifacts/${project.name}" subdirectory="php-code-browser"/> -->
|
| 38 | | - <execute command="/usr/bin/phpuc graph logs/${project.name} artifacts/${project.name}"/>
|
| 39 | | - <!--
|
| 40 | | - Sends simple text emails after a project build. For nicer html emails,
|
| 41 | | - checkout the original CruiseControl documentation.
|
| 42 | | -
|
| 43 | | -* http://cruisecontrol.sourceforge.net/main/configxml.html#email
|
| 44 | | -* http://cruisecontrol.sourceforge.net/main/configxml.html#htmlemail
|
| 45 | | - -->
|
| 46 | | - <email mailhost="localhost"
|
| 47 | | - returnaddress="cruise@phpundercontrol.org"
|
| 48 | | - buildresultsurl="http://ci.tesla.usability.wikimedia.org:8080/cruisecontrol/buildresults/${project.name}"
|
| 49 | | - skipusers="true" spamwhilebroken="true">
|
| 50 | | - <failure address="mah@everybody.org"/>
|
| 51 | | - </email>
|
| 52 | | - </publishers>
|
| 53 | | - </project>
|
| 54 | | -</cruisecontrol>
|
| | 2 | +<?xml version="1.0"?> |
| | 3 | +<cruisecontrol> |
| | 4 | + <project name="mw"> |
| | 5 | + <plugin name="svnbootstrapper" |
| | 6 | + classname="net.sourceforge.cruisecontrol.bootstrappers.SVNBootstrapper"/> |
| | 7 | + <plugin name="svn" classname="net.sourceforge.cruisecontrol.sourcecontrols.SVN"/> |
| | 8 | + <listeners> |
| | 9 | + <currentbuildstatuslistener file="logs/${project.name}/status.txt"/> |
| | 10 | + </listeners> |
| | 11 | + <bootstrappers> |
| | 12 | + <antbootstrapper anthome="apache-ant-1.7.0" |
| | 13 | + buildfile="projects/${project.name}/build.xml" target="clean"/> |
| | 14 | + </bootstrappers> |
| | 15 | + <modificationset quietperiod="300"> |
| | 16 | + <!-- touch any file in connectfour project to trigger a build --> |
| | 17 | + <filesystem folder="projects/${project.name}/touchme"/> |
| | 18 | + <svn RepositoryLocation="http://svn.wikimedia.org/svnroot/mediawiki/trunk/phase3"/> |
| | 19 | + </modificationset> |
| | 20 | + <schedule interval="3600"> |
| | 21 | + <ant anthome="apache-ant-1.7.0" buildfile="projects/${project.name}/build.xml"/> |
| | 22 | + </schedule> |
| | 23 | + <log> |
| | 24 | + <merge dir="projects/${project.name}/build/logs"/> |
| | 25 | + <delete every="1" unit="WEEK" /> |
| | 26 | + <gzip every="1" unit="DAY" /> |
| | 27 | + <deleteartifacts every="1" unit="day" /> |
| | 28 | + </log> |
| | 29 | + <publishers> |
| | 30 | + <artifactspublisher dir="projects/${project.name}/build/api" |
| | 31 | + dest="artifacts/${project.name}" subdirectory="api"/> |
| | 32 | + <artifactspublisher dir="projects/${project.name}/build/coverage" |
| | 33 | + dest="artifacts/${project.name}" subdirectory="coverage"/> |
| | 34 | + <execute command="phpcb --log projects/${project.name}/build/logs |
| | 35 | + --source projects/${project.name}/source |
| | 36 | + --output projects/${project.name}/build/${project.name}"/> |
| | 37 | + <!-- <artifactspublisher dir="projects/${project.name}/build/php-code-browser" dest="artifacts/${project.name}" subdirectory="php-code-browser"/> --> |
| | 38 | + <!-- <execute command="/usr/bin/phpuc graph logs/${project.name} artifacts/${project.name}"/> --> |
| | 39 | + <!-- |
| | 40 | + Sends simple text emails after a project build. For nicer html emails, |
| | 41 | + checkout the original CruiseControl documentation. |
| | 42 | + |
| | 43 | +* http://cruisecontrol.sourceforge.net/main/configxml.html#email |
| | 44 | +* http://cruisecontrol.sourceforge.net/main/configxml.html#htmlemail |
| | 45 | + --> |
| | 46 | + <email mailhost="localhost" |
| | 47 | + returnaddress="cruise@phpundercontrol.org" |
| | 48 | + buildresultsurl="http://ci.tesla.usability.wikimedia.org:8080/cruisecontrol/buildresults/${project.name}" |
| | 49 | + skipusers="true" spamwhilebroken="true"> |
| | 50 | + <failure address="mah@everybody.org"/> |
| | 51 | + </email> |
| | 52 | + <antpublisher anthome="apache-ant-1.7.0" |
| | 53 | + buildfile="projects/${project.name}/build.xml" |
| | 54 | + target="irc-publish"/> |
| | 55 | + </publishers> |
| | 56 | + </project> |
| | 57 | +</cruisecontrol> |
| Index: trunk/test-server/cc-home/cruisecontrol.sh |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | fi |
| 69 | 69 | |
| 70 | 70 | # Uncomment the following line if you have OutOfMemoryError errors |
| 71 | | -# CC_OPTS="-Xms128m -Xmx256m" |
| | 71 | +CC_OPTS="-Xms1024m -Xmx1512m" |
| 72 | 72 | |
| 73 | 73 | #-------------------------------------------- |
| 74 | 74 | # set JAVA_HOME on Mac OSX |
| Index: trunk/test-server/cc-home/projects/mw/build.properties |
| — | — | @@ -3,7 +3,7 @@ |
| 4 | 4 | apache.root=/var/www/irc |
| 5 | 5 | |
| 6 | 6 | # This is the part of the source checkout we're going to do things like PHPDoc, etc |
| 7 | | -sourcepart=includes/api |
| | 7 | +sourcepart=. |
| 8 | 8 | |
| 9 | 9 | javax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl |
| 10 | 10 | |
| Index: trunk/test-server/cc-home/projects/mw/irc-publisher.xsl |
| — | — | @@ -9,13 +9,11 @@ |
| 10 | 10 | method="text" |
| 11 | 11 | encoding="UTF-8" /> |
| 12 | 12 | |
| 13 | | - <xsl:template match="/cruisecontrol/build[@error]"> |
| 14 | | -Something broke: <xsl:value-of select="string(@error)"/> |
| 15 | | - <xsl:call-template name="get-last-modified"/> |
| | 13 | + <xsl:template match="/cruisecontrol/build[@error]">Something broke. See <http://ci.tesla.usability.wikimedia.org/cruisecontrol/buildresults/mw>. |
| | 14 | +<xsl:call-template name="get-last-modified"/> |
| 16 | 15 | </xsl:template> |
| 17 | 16 | |
| 18 | | - <xsl:template name="get-last-modified"><xsl:text> |
| 19 | | -Possible culprits: </xsl:text> |
| | 17 | + <xsl:template name="get-last-modified"><xsl:text>Possible culprits: </xsl:text> |
| 20 | 18 | <xsl:for-each select="set:distinct(c:node-set( |
| 21 | 19 | /cruisecontrol/modifications/modification/user | |
| 22 | 20 | /cruisecontrol/modifications/modification/revision))"> |
| Index: trunk/test-server/cc-home/projects/mw/build.xml |
| — | — | @@ -59,11 +59,12 @@ |
| 60 | 60 | <target name="test-static" depends="prepare"> |
| 61 | 61 | <parallel> |
| 62 | 62 | <antcall target="lint" /> |
| 63 | | - <antcall target="phpmd" /> |
| 64 | | - <antcall target="checkstyle" /> |
| | 63 | + <!-- <antcall target="checkstyle" /> --> |
| 65 | 64 | </parallel> |
| | 65 | + <!-- Took this out of the parallel run b/c of memory requirements --> |
| | 66 | + <!-- <antcall target="phpmd" /> --> |
| 66 | 67 | <!-- Do not run phpmd and pdepend parallel, there is a concurrency problem --> |
| 67 | | - <antcall target="pdepend" /> |
| | 68 | + <!-- <antcall target="pdepend" /> --> |
| 68 | 69 | </target> |
| 69 | 70 | |
| 70 | 71 | <!-- |
| — | — | @@ -91,7 +92,6 @@ |
| 92 | 93 | --templatebase ${builddir}/data/phpdoc |
| 93 | 94 | --output HTML:Phpuc:phpuc |
| 94 | 95 | --directory ${sourcepart} |
| 95 | | - --ignore-tags @file |
| 96 | 96 | --customtags ingroup,defgroup,maintainers,note,addtogroup,showinitializer,protected |
| 97 | 97 | --ignore 'Messages*.php'"/> |
| 98 | 98 | </exec> |
| — | — | @@ -124,7 +124,7 @@ |
| 125 | 125 | </target> |
| 126 | 126 | |
| 127 | 127 | <target name="phpunit" depends="prepare"> |
| 128 | | - <exec executable="./phpunit" dir="${sourcedir}/maintenance/tests"> |
| | 128 | + <exec executable="./phpunit" dir="${sourcedir}/maintenance/tests" failonerror="true"> |
| 129 | 129 | <arg line="--log-junit ${builddir}/logs/junit.xml --coverage-clover ${builddir}/logs/phpunit.coverage.xml --coverage-html ${builddir}/coverage" /> |
| 130 | 130 | </exec> |
| 131 | 131 | </target> |
| — | — | @@ -154,7 +154,7 @@ |
| 155 | 155 | <target name="irc-publish" unless="${thisbuildsuccessful}" depends="userinfo-up"> |
| 156 | 156 | <!-- $logfile is the file --> |
| 157 | 157 | |
| 158 | | - <xslt in="${logfile}" out="${apache.root}/irc-publish.txt" |
| | 158 | + <xslt in="${logdir}/${logfile}" out="${apache.root}/irc-publish.txt" |
| 159 | 159 | style="${basedir}/irc-publisher.xsl"> |
| 160 | 160 | <param name="userinfo" expression="file://${builddir}/data/userinfo.xml"/> |
| 161 | 161 | </xslt> |
| Index: trunk/test-server/cruisecontrol-init.d |
| — | — | @@ -16,6 +16,7 @@ |
| 17 | 17 | CCPIDFILE=$CCDIR/cc.pid |
| 18 | 18 | STARTCC=$CCDIR/cruisecontrol.sh |
| 19 | 19 | CCUSER=ci |
| | 20 | +HOME=/home/ci |
| 20 | 21 | CCNAME=CruiseControl |
| 21 | 22 | |
| 22 | 23 | export CCDIR |
| — | — | @@ -44,7 +45,7 @@ |
| 45 | 46 | fi |
| 46 | 47 | |
| 47 | 48 | cd $CCDIR |
| 48 | | - if sudo -u $CCUSER $STARTCC >/dev/null 2>/dev/null; then |
| | 49 | + if sudo -u $CCUSER env HOME=$HOME $STARTCC >/dev/null 2>/dev/null; then |
| 49 | 50 | log_action_end_msg $? |
| 50 | 51 | else |
| 51 | 52 | log_action_end_msg $? |
| — | — | @@ -81,7 +82,7 @@ |
| 82 | 83 | |
| 83 | 84 | ;; |
| 84 | 85 | restart) |
| 85 | | - $0 stop |
| | 86 | + $0 stop || true |
| 86 | 87 | $0 start |
| 87 | 88 | ;; |
| 88 | 89 | *) |