You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gm...@apache.org on 2010/05/22 10:21:07 UTC
svn commit: r947269 - in /subversion/trunk/build/hudson: ./
jobs/subversion-1.6.x-solaris/ jobs/subversion-1.6.x-ubuntu/
jobs/subversion-doxygen/ jobs/subversion-javadoc/
jobs/subversion-trunk-solaris/ jobs/subversion-trunk-ubuntu/
Author: gmcdonald
Date: Sat May 22 08:21:07 2010
New Revision: 947269
URL: http://svn.apache.org/viewvc?rev=947269&view=rev
Log:
Configs changed for Hudson Builds
Both Solaris builds moved to hudson-solaris.a.o
some builds changed to point to correct/added to apr/apr-util
some needed to point to correct sqlite.c rather than use installed binary
some dependencies needed installing on some slaves
All builds now use a fresh checkout, no need for update mode, doesnt save much
Polling times staggered a bit
emails re-enabled where it was disabled
emails for multiple failing builds disabled, just have the first occurance
other tweaks
Modified:
subversion/trunk/build/hudson/README
subversion/trunk/build/hudson/jobs/subversion-1.6.x-solaris/config.xml
subversion/trunk/build/hudson/jobs/subversion-1.6.x-ubuntu/config.xml
subversion/trunk/build/hudson/jobs/subversion-doxygen/config.xml
subversion/trunk/build/hudson/jobs/subversion-javadoc/config.xml
subversion/trunk/build/hudson/jobs/subversion-trunk-solaris/config.xml
subversion/trunk/build/hudson/jobs/subversion-trunk-ubuntu/config.xml
Modified: subversion/trunk/build/hudson/README
URL: http://svn.apache.org/viewvc/subversion/trunk/build/hudson/README?rev=947269&r1=947268&r2=947269&view=diff
==============================================================================
--- subversion/trunk/build/hudson/README (original)
+++ subversion/trunk/build/hudson/README Sat May 22 08:21:07 2010
@@ -11,10 +11,10 @@ The test results can be viewed in this p
SETUP DETAILS
-------------
- The last 40 build reports are retained.
- - The Subversion repository is polled every 1 hour.
+ - The Subversion repository is polled every 1 hour (staggered).
- The failure notifications are sent to
notifications@subversion.apache.org mailing list.
- The builds corresponding to Linux are performed in a Ubuntu system.
- The Linux builds are tied to minerva.apache.org host.
- The builds corresponding to Solaris are performed in a Solaris 10 system.
- - The Solaris builds are tied to lucene.zones.apache.org host.
+ - The Solaris builds are tied to hudson-solaris.zones.apache.org host.
Modified: subversion/trunk/build/hudson/jobs/subversion-1.6.x-solaris/config.xml
URL: http://svn.apache.org/viewvc/subversion/trunk/build/hudson/jobs/subversion-1.6.x-solaris/config.xml?rev=947269&r1=947268&r2=947269&view=diff
==============================================================================
--- subversion/trunk/build/hudson/jobs/subversion-1.6.x-solaris/config.xml (original)
+++ subversion/trunk/build/hudson/jobs/subversion-1.6.x-solaris/config.xml Sat May 22 08:21:07 2010
@@ -16,90 +16,99 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
+-->
<project>
- <actions/>
- <description>Build Subversion from 1.6.x branch on Solaris10 system</description>
+ <actions />
+ <description>Build Subversion from 1.6.x branch on Solaris10 system</description>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>40</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>40</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
- <keepDependencies>false</keepDependencies>
+ <keepDependencies>false</keepDependencies>
<properties>
- <hudson.plugins.disk__usage.DiskUsageProperty/>
- <hudson.plugins.descriptionsetter.JobByDescription/>
+ <hudson.plugins.descriptionsetter.JobByDescription />
+ <hudson.plugins.disk__usage.DiskUsageProperty />
<hudson.plugins.jira.JiraProjectProperty>
- <siteName>https://issues.apache.org/jira/</siteName>
+ <siteName>https://issues.apache.org/jira/</siteName>
</hudson.plugins.jira.JiraProjectProperty>
</properties>
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>https://svn.apache.org/repos/asf/subversion/branches/1.6.x</remote>
- <local>subversion-1.6.x</local>
+ <remote>https://svn.apache.org/repos/asf/subversion/branches/1.6.x</remote>
+ <local>subversion-1.6.x</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
- <useUpdate>true</useUpdate>
+ <useUpdate>false</useUpdate>
+ <doRevert>false</doRevert>
<browser class="hudson.scm.browsers.ViewSVN">
- <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
+ <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
</browser>
- <excludedRegions></excludedRegions>
- <excludedUsers></excludedUsers>
- <excludedRevprop></excludedRevprop>
+ <excludedRegions />
+ <includedRegions />
+ <excludedUsers />
+ <excludedRevprop />
+ <excludedCommitMessages />
</scm>
- <assignedNode>lucene.zones.apache.org (Solaris 10)</assignedNode>
- <canRoam>false</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <jdk>(Default)</jdk>
+ <assignedNode>hudson-solaris (Solaris)</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>(Default)</jdk>
<triggers class="vector">
<hudson.triggers.SCMTrigger>
- <spec>0 * * * *</spec>
+ <spec>0 * * * *</spec>
</hudson.triggers.SCMTrigger>
</triggers>
- <concurrentBuild>false</concurrentBuild>
+ <concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
- <command>cd subversion-1.6.x
+ <command>
+ cd subversion-1.6.x
+ PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin:$PATH";
+ export PATH
+ ./autogen.sh
+ ./configure
+ --enable-maintainer-mode
+ --disable-shared
+ --with-custom-libtool=/opt/sfw/bin/libtool
+ --with-apr=/opt/subversion-current/apr
+ --with-apr-util=/opt/subversion-current/apr-util-1.3.9
+ --with-sqlite=/opt/subversion-current/sqlite-3.6.23.1/sqlite3.c
-PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin:$PATH"; export PATH
-
-/usr/ccs/bin/make clean
-
-./autogen.sh
-
-./configure --enable-maintainer-mode --disable-shared --with-custom-libtool=/opt/sfw/bin/libtool --with-apr=apr/ --with-apr-util=apr-util/
-
-/usr/ccs/bin/make</command>
+ /usr/ccs/bin/make
+ </command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
- <command>#!/bin/bash
-
-cd subversion-1.6.x
-
-PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin"; export PATH
-
-/usr/ccs/bin/make check
-
-ret=$?
-
-echo "Generating junit files ..."
-
-python ../../subversion-trunk-solaris/subversion-trunk/tools/dev/gen_junit_report.py --log-file=./tests.log --output-dir=build/junit-reports
-
-exit $ret</command>
+ <command>
+ #!/bin/bash
+ cd subversion-1.6.x
+ PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin";
+ export PATH
+ /usr/ccs/bin/make check
+ ret=$?
+ echo "Generating junit files ..."
+ python ../../subversion-trunk-solaris/subversion-trunk/tools/dev/gen_junit_report.py
+ --log-file=./tests.log
+ --output-dir=build/junit-reports
+ exit
+ $ret
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>subversion-1.6.x/build/junit-reports/*</testResults>
- <testDataPublishers/>
+ <testResults>subversion-1.6.x/build/junit-reports/*</testResults>
+ <testDataPublishers />
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
- <recipients>notifications@subversion.apache.org</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
+ <recipients>notifications@subversion.apache.org</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
</publishers>
- <buildWrappers/>
+ <buildWrappers />
</project>
+
Modified: subversion/trunk/build/hudson/jobs/subversion-1.6.x-ubuntu/config.xml
URL: http://svn.apache.org/viewvc/subversion/trunk/build/hudson/jobs/subversion-1.6.x-ubuntu/config.xml?rev=947269&r1=947268&r2=947269&view=diff
==============================================================================
--- subversion/trunk/build/hudson/jobs/subversion-1.6.x-ubuntu/config.xml (original)
+++ subversion/trunk/build/hudson/jobs/subversion-1.6.x-ubuntu/config.xml Sat May 22 08:21:07 2010
@@ -18,85 +18,95 @@
under the License.
-->
<project>
- <actions/>
- <description>Build Subversion from 1.6.x branch on Ubuntu system</description>
+ <actions />
+ <description>Build Subversion from 1.6.x branch on Ubuntu system</description>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>40</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>40</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
- <keepDependencies>false</keepDependencies>
+ <keepDependencies>false</keepDependencies>
<properties>
- <hudson.plugins.disk__usage.DiskUsageProperty/>
- <hudson.plugins.descriptionsetter.JobByDescription/>
+ <hudson.plugins.descriptionsetter.JobByDescription />
+ <hudson.plugins.disk__usage.DiskUsageProperty />
<hudson.plugins.jira.JiraProjectProperty>
- <siteName>https://issues.apache.org/jira/</siteName>
+ <siteName>https://issues.apache.org/jira/</siteName>
</hudson.plugins.jira.JiraProjectProperty>
</properties>
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>https://svn.apache.org/repos/asf/subversion/branches/1.6.x</remote>
- <local>subversion-1.6.x</local>
+ <remote>https://svn.apache.org/repos/asf/subversion/branches/1.6.x</remote>
+ <local>subversion-1.6.x</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
- <useUpdate>true</useUpdate>
+ <useUpdate>false</useUpdate>
+ <doRevert>false</doRevert>
<browser class="hudson.scm.browsers.ViewSVN">
- <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
+ <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
</browser>
- <excludedRegions></excludedRegions>
- <excludedUsers></excludedUsers>
- <excludedRevprop></excludedRevprop>
+ <excludedRegions />
+ <includedRegions />
+ <excludedUsers />
+ <excludedRevprop />
+ <excludedCommitMessages />
</scm>
- <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
- <canRoam>false</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <jdk>(Default)</jdk>
+ <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>(Default)</jdk>
<triggers class="vector">
<hudson.triggers.SCMTrigger>
- <spec>0 * * * *</spec>
+ <spec>0 * * * *</spec>
</hudson.triggers.SCMTrigger>
</triggers>
- <concurrentBuild>false</concurrentBuild>
+ <concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
- <command>cd subversion-1.6.x
-
-make distclean
-
-./autogen.sh
-
-./configure --enable-maintainer-mode --disable-shared
-
-make
-</command>
+ <command>
+ cd subversion-1.6.x
+ # make distclean
+ ./autogen.sh
+ # cp /home/bhuvan/apr . -r
+ # cp /home/bhuvan/apr-util . -r
+ # cp /home/bhuvan/sqlite-amalgamation . -r
+ ./configure
+ --enable-maintainer-mode
+ --disable-shared
+ --with-apr=/usr/local/apr/apr-1.4.2
+ --with-apr-util=/usr/local/apr/apr-util-1.3.9
+ --with-sqlite=/usr/local/svn-deps/subversion-1.6.11/sqlite-amalgamation/sqlite3.c
+ make
+ </command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
- <command>#!/bin/bash
-
-cd subversion-1.6.x
-
-make check
-
-ret=$?
-
-echo "Generating junit files ..."
-
-python ../../subversion-trunk-ubuntu/subversion-trunk/tools/dev/gen_junit_report.py --log-file=./tests.log --output-dir=build/junit-reports
-
-exit $ret</command>
+ <command>
+ #!/bin/bash
+ cd subversion-1.6.x
+ make check
+ ret=$?
+ echo "Generating junit files ..."
+ python ../../subversion-trunk-ubuntu/subversion-trunk/tools/dev/gen_junit_report.py
+ --log-file=./tests.log
+ --output-dir=build/junit-reports
+ exit
+ $ret
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>subversion-1.6.x/build/junit-reports/*</testResults>
- <testDataPublishers/>
+ <testResults>subversion-1.6.x/build/junit-reports/*</testResults>
+ <testDataPublishers />
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
- <recipients>notifications@subversion.apache.org</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
+ <recipients>notifications@subversion.apache.org</recipients>
+ <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
</publishers>
- <buildWrappers/>
+ <buildWrappers />
</project>
+
Modified: subversion/trunk/build/hudson/jobs/subversion-doxygen/config.xml
URL: http://svn.apache.org/viewvc/subversion/trunk/build/hudson/jobs/subversion-doxygen/config.xml?rev=947269&r1=947268&r2=947269&view=diff
==============================================================================
--- subversion/trunk/build/hudson/jobs/subversion-doxygen/config.xml (original)
+++ subversion/trunk/build/hudson/jobs/subversion-doxygen/config.xml Sat May 22 08:21:07 2010
@@ -16,74 +16,87 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
+-->
<project>
- <actions/>
- <description>Build Subversion doxygen doc from "trunk" branch</description>
+ <actions />
+ <description>Build Subversion doxygen doc from "trunk" branch</description>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>40</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>40</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
- <keepDependencies>false</keepDependencies>
+ <keepDependencies>false</keepDependencies>
<properties>
- <hudson.plugins.disk__usage.DiskUsageProperty/>
- <hudson.plugins.descriptionsetter.JobByDescription/>
+ <hudson.plugins.descriptionsetter.JobByDescription />
+ <hudson.plugins.disk__usage.DiskUsageProperty />
<hudson.plugins.jira.JiraProjectProperty>
- <siteName>https://issues.apache.org/jira/</siteName>
+ <siteName>https://issues.apache.org/jira/</siteName>
</hudson.plugins.jira.JiraProjectProperty>
</properties>
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
- <local>subversion-trunk</local>
- </hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
+ <local>subversion-trunk</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
- <useUpdate>true</useUpdate>
+ <useUpdate>false</useUpdate>
+ <doRevert>false</doRevert>
<browser class="hudson.scm.browsers.ViewSVN">
- <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
+ <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
</browser>
- <excludedRegions></excludedRegions>
- <excludedUsers></excludedUsers>
- <excludedRevprop></excludedRevprop>
+ <excludedRegions />
+ <includedRegions />
+ <excludedUsers />
+ <excludedRevprop />
+ <excludedCommitMessages />
</scm>
- <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
- <canRoam>false</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <jdk>(Default)</jdk>
+ <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>(Default)</jdk>
<triggers class="vector">
<hudson.triggers.SCMTrigger>
- <spec>0 23 * * *</spec>
+ <spec>0 23 * * *</spec>
</hudson.triggers.SCMTrigger>
</triggers>
- <concurrentBuild>false</concurrentBuild>
+ <concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
- <command>cd subversion-trunk
-
-./autogen.sh
-
-./configure --enable-maintainer-mode --disable-shared --with-apr=../../subversion-trunk-ubuntu/subversion-trunk/apr --with-apr-util=../../subversion-trunk-ubuntu/subversion-trunk/apr-util --with-jdk=/home/hudson/tools/java/jdk1.6.0_17-64/
-
-make
-</command>
+ <command>
+ cd subversion-trunk
+ ./autogen.sh
+ ./configure
+ --enable-maintainer-mode
+ --disable-shared
+ --with-apr=/usr/local/apr/apr-1.4.2
+ --with-apr-util=/usr/local/apr/apr-util-1.3.9
+ --with-jdk=/home/hudson/tools/java/jdk1.6.0_17-64/
+ make
+ </command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
- <command>#!/bin/bash
-
-cd subversion-trunk
-
-export PATH=doxygen-1.6.1/bin:$PATH
-
-make doc-api</command>
+ <command>
+ #!/bin/bash
+ cd subversion-trunk
+ export PATH=doxygen-1.6.1/bin:$PATH
+ make doc-api
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.JavadocArchiver>
- <javadocDir>subversion-trunk/doc/doxygen/html</javadocDir>
- <keepAll>false</keepAll>
+ <javadocDir>subversion-trunk/doc/doxygen/html</javadocDir>
+ <keepAll>false</keepAll>
</hudson.tasks.JavadocArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>notifications@subversion.apache.org</recipients>
+ <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
</publishers>
- <buildWrappers/>
+ <buildWrappers />
</project>
+
Modified: subversion/trunk/build/hudson/jobs/subversion-javadoc/config.xml
URL: http://svn.apache.org/viewvc/subversion/trunk/build/hudson/jobs/subversion-javadoc/config.xml?rev=947269&r1=947268&r2=947269&view=diff
==============================================================================
--- subversion/trunk/build/hudson/jobs/subversion-javadoc/config.xml (original)
+++ subversion/trunk/build/hudson/jobs/subversion-javadoc/config.xml Sat May 22 08:21:07 2010
@@ -16,74 +16,87 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
+-->
<project>
- <actions/>
- <description>Build Subversion javadoc from "trunk" branch</description>
+ <actions />
+ <description>Build Subversion javadoc from "trunk" branch</description>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>40</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>40</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
- <keepDependencies>false</keepDependencies>
+ <keepDependencies>false</keepDependencies>
<properties>
- <hudson.plugins.disk__usage.DiskUsageProperty/>
- <hudson.plugins.descriptionsetter.JobByDescription/>
+ <hudson.plugins.descriptionsetter.JobByDescription />
+ <hudson.plugins.disk__usage.DiskUsageProperty />
<hudson.plugins.jira.JiraProjectProperty>
- <siteName>https://issues.apache.org/jira/</siteName>
+ <siteName>https://issues.apache.org/jira/</siteName>
</hudson.plugins.jira.JiraProjectProperty>
</properties>
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
- <local>subversion-trunk</local>
+ <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
+ <local>subversion-trunk</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
- <useUpdate>true</useUpdate>
+ <useUpdate>false</useUpdate>
+ <doRevert>false</doRevert>
<browser class="hudson.scm.browsers.ViewSVN">
- <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
+ <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
</browser>
- <excludedRegions></excludedRegions>
- <excludedUsers></excludedUsers>
- <excludedRevprop></excludedRevprop>
+ <excludedRegions />
+ <includedRegions />
+ <excludedUsers />
+ <excludedRevprop />
+ <excludedCommitMessages />
</scm>
- <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
- <canRoam>false</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <jdk>(Default)</jdk>
+ <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>(Default)</jdk>
<triggers class="vector">
<hudson.triggers.SCMTrigger>
- <spec>0 23 * * *</spec>
+ <spec>0 23 * * *</spec>
</hudson.triggers.SCMTrigger>
</triggers>
- <concurrentBuild>false</concurrentBuild>
+ <concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
- <command>cd subversion-trunk
-
-./autogen.sh
-
-./configure --enable-maintainer-mode --disable-shared --with-apr=../../subversion-trunk-ubuntu/subversion-trunk/apr --with-apr-util=../../subversion-trunk-ubuntu/subversion-trunk/apr-util --with-jdk=/home/hudson/tools/java/jdk1.6.0_17-64/
-
-make
-</command>
+ <command>
+ cd subversion-trunk
+ ./autogen.sh
+ ./configure
+ --enable-maintainer-mode
+ --disable-shared
+ --with-apr=/usr/local/apr/apr-1.4.2
+ --with-apr-util=/usr/local/apr/apr-util-1.3.9
+ --with-jdk=/home/hudson/tools/java/jdk1.6.0_17-64/
+ make
+ </command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
- <command>#!/bin/bash
-
-cd subversion-trunk
-
-export PATH=doxygen-1.6.1/bin:$PATH
-
-make doc-javahl</command>
+ <command>
+ #!/bin/bash
+ cd subversion-trunk
+ export PATH=doxygen-1.6.1/bin:$PATH
+ make doc-javahl
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.JavadocArchiver>
- <javadocDir>subversion-trunk/doc/javadoc/</javadocDir>
- <keepAll>false</keepAll>
+ <javadocDir>subversion-trunk/doc/javadoc/</javadocDir>
+ <keepAll>false</keepAll>
</hudson.tasks.JavadocArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>notifications@subversion.apache.org</recipients>
+ <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
+ </hudson.tasks.Mailer>
</publishers>
- <buildWrappers/>
+ <buildWrappers />
</project>
+
Modified: subversion/trunk/build/hudson/jobs/subversion-trunk-solaris/config.xml
URL: http://svn.apache.org/viewvc/subversion/trunk/build/hudson/jobs/subversion-trunk-solaris/config.xml?rev=947269&r1=947268&r2=947269&view=diff
==============================================================================
--- subversion/trunk/build/hudson/jobs/subversion-trunk-solaris/config.xml (original)
+++ subversion/trunk/build/hudson/jobs/subversion-trunk-solaris/config.xml Sat May 22 08:21:07 2010
@@ -18,85 +18,93 @@
under the License.
-->
<project>
- <actions/>
- <description>Build Subversion from "trunk" branch on Solaris10 system</description>
+ <actions />
+ <description>Build Subversion from "trunk" branch on Solaris10 system</description>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>40</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>40</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
- <keepDependencies>false</keepDependencies>
+ <keepDependencies>false</keepDependencies>
<properties>
- <hudson.plugins.disk__usage.DiskUsageProperty/>
- <hudson.plugins.descriptionsetter.JobByDescription/>
+ <hudson.plugins.descriptionsetter.JobByDescription />
+ <hudson.plugins.disk__usage.DiskUsageProperty />
<hudson.plugins.jira.JiraProjectProperty>
- <siteName>https://issues.apache.org/jira/</siteName>
+ <siteName>https://issues.apache.org/jira/</siteName>
</hudson.plugins.jira.JiraProjectProperty>
</properties>
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
- <local>subversion-trunk</local>
+ <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
+ <local>subversion-trunk</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
- <useUpdate>true</useUpdate>
- <excludedRegions></excludedRegions>
- <excludedUsers></excludedUsers>
- <excludedRevprop></excludedRevprop>
+ <useUpdate>false</useUpdate>
+ <doRevert>false</doRevert>
+ <excludedRegions />
+ <includedRegions />
+ <excludedUsers />
+ <excludedRevprop />
+ <excludedCommitMessages />
</scm>
- <assignedNode>lucene.zones.apache.org (Solaris 10)</assignedNode>
- <canRoam>false</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <jdk>(Default)</jdk>
+ <assignedNode>hudson-solaris (Solaris)</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>(Default)</jdk>
<triggers class="vector">
<hudson.triggers.SCMTrigger>
- <spec>0 * * * *</spec>
+ <spec>30 * * * *</spec>
</hudson.triggers.SCMTrigger>
</triggers>
- <concurrentBuild>false</concurrentBuild>
+ <concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
- <command>cd subversion-trunk
-
-PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin:$PATH"; export PATH
-
-/usr/ccs/bin/make clean
-
-./autogen.sh
-
-./configure --enable-maintainer-mode --disable-shared --with-custom-libtool=/opt/sfw/bin/libtool --with-apr=apr/ --with-apr-util=apr-util/
-
-/usr/ccs/bin/make</command>
+ <command>
+ cd subversion-trunk
+ PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/opt/subversion-current/sqlite-3.6.23.1:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin:$PATH";
+ export PATH
+ ./autogen.sh
+ ./configure
+ --enable-maintainer-mode
+ --disable-shared
+ --with-custom-libtool=/opt/sfw/bin/libtool
+ --with-apr=/opt/subversion-current/apr
+ --with-apr-util=/opt/subversion-current/apr-util-1.3.9
+ --with-sqlite=/opt/subversion-current/sqlite-3.6.23.1/sqlite3.c
+ make
+ </command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
- <command>#!/bin/bash
-
-cd subversion-trunk
-
-PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin"; export PATH
-
-/usr/ccs/bin/make check
-
-ret=$?
-
-echo "Generating junit files ..."
-
-python tools/dev/gen_junit_report.py --log-file=./tests.log --output-dir=build/junit-reports
-
-exit $ret</command>
+ <command>
+ #!/bin/bash
+ cd subversion-trunk
+ PATH="/export/home/hudson/bin:/export/home/hudson/tools/java/latest/bin:/export/home/hudson/tools/ant/latest/bin:/export/home/hudson/tools/tomcat/latest/bin:/opt/subversion-current/bin:/usr/ucb:/usr/local/bin:/usr/bin:/usr/sfw/bin:/usr/sfw/sbin:/opt/sfw/bin:/opt/sfw/sbin:/opt/SUNWspro/bin:/usr/X/bin:/usr/ucb:/usr/sbin:/usr/ccs/bin";
+ export PATH
+ make check
+ ret=$?
+ echo "Generating junit files ..."
+ python tools/dev/gen_junit_report.py
+ --log-file=./tests.log
+ --output-dir=build/junit-reports
+ exit
+ $ret
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>subversion-trunk/build/junit-reports/*</testResults>
- <testDataPublishers/>
+ <testResults>subversion-trunk/build/junit-reports/*</testResults>
+ <testDataPublishers />
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
- <recipients>notifications@subversion.apache.org</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
+ <recipients>notifications@subversion.apache.org</recipients>
+ <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
</publishers>
- <buildWrappers/>
+ <buildWrappers />
</project>
+
Modified: subversion/trunk/build/hudson/jobs/subversion-trunk-ubuntu/config.xml
URL: http://svn.apache.org/viewvc/subversion/trunk/build/hudson/jobs/subversion-trunk-ubuntu/config.xml?rev=947269&r1=947268&r2=947269&view=diff
==============================================================================
--- subversion/trunk/build/hudson/jobs/subversion-trunk-ubuntu/config.xml (original)
+++ subversion/trunk/build/hudson/jobs/subversion-trunk-ubuntu/config.xml Sat May 22 08:21:07 2010
@@ -18,85 +18,89 @@
under the License.
-->
<project>
- <actions/>
- <description>Build Subversion from "trunk" branch on Ubuntu system</description>
+ <actions />
+ <description>Build Subversion from "trunk" branch on Ubuntu system</description>
<logRotator>
- <daysToKeep>-1</daysToKeep>
- <numToKeep>40</numToKeep>
+ <daysToKeep>-1</daysToKeep>
+ <numToKeep>40</numToKeep>
+ <artifactDaysToKeep>-1</artifactDaysToKeep>
+ <artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
- <keepDependencies>false</keepDependencies>
+ <keepDependencies>false</keepDependencies>
<properties>
- <hudson.plugins.disk__usage.DiskUsageProperty/>
- <hudson.plugins.descriptionsetter.JobByDescription/>
+ <hudson.plugins.descriptionsetter.JobByDescription />
+ <hudson.plugins.disk__usage.DiskUsageProperty />
<hudson.plugins.jira.JiraProjectProperty>
- <siteName>https://issues.apache.org/jira/</siteName>
+ <siteName>https://issues.apache.org/jira/</siteName>
</hudson.plugins.jira.JiraProjectProperty>
</properties>
<scm class="hudson.scm.SubversionSCM">
<locations>
<hudson.scm.SubversionSCM_-ModuleLocation>
- <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
- <local>subversion-trunk</local>
+ <remote>https://svn.apache.org/repos/asf/subversion/trunk</remote>
+ <local>subversion-trunk</local>
</hudson.scm.SubversionSCM_-ModuleLocation>
</locations>
- <useUpdate>true</useUpdate>
+ <useUpdate>false</useUpdate>
+ <doRevert>false</doRevert>
<browser class="hudson.scm.browsers.ViewSVN">
- <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
+ <url>http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN</url>
</browser>
- <excludedRegions></excludedRegions>
- <excludedUsers></excludedUsers>
- <excludedRevprop></excludedRevprop>
+ <excludedRegions />
+ <includedRegions />
+ <excludedUsers />
+ <excludedRevprop />
+ <excludedCommitMessages />
</scm>
- <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
- <canRoam>false</canRoam>
- <disabled>false</disabled>
- <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
- <jdk>(Default)</jdk>
+ <assignedNode>minerva.apache.org (Ubuntu)</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>(Default)</jdk>
<triggers class="vector">
<hudson.triggers.SCMTrigger>
- <spec>0 * * * *</spec>
+ <spec>15 * * * *</spec>
</hudson.triggers.SCMTrigger>
</triggers>
- <concurrentBuild>false</concurrentBuild>
+ <concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.Shell>
- <command>cd subversion-trunk
-
-make distclean
-
-./autogen.sh
-
-./configure --enable-maintainer-mode --disable-shared
-
-make
-</command>
+ <command>
+ cd subversion-trunk
+ #make distclean
+ ./autogen.sh
+ ./configure
+ --enable-maintainer-mode
+ --disable-shared
+ --with-apr=/usr/local/apr/apr-1.4.2
+ --with-apr-util=/usr/local/apr/apr-util-1.3.9
+ --with-sqlite=/usr/local/svn-deps/subversion-1.6.11/sqlite-amalgamation/sqlite3.c make
+ </command>
</hudson.tasks.Shell>
<hudson.tasks.Shell>
- <command>#!/bin/bash
-
-cd subversion-trunk
-
-make check
-
-ret=$?
-
-echo "Generating junit files ..."
-
-python tools/dev/gen_junit_report.py --log-file=./tests.log --output-dir=build/junit-reports
-
-exit $ret</command>
+ <command>
+ #!/bin/bash
+ cd subversion-trunk
+ make check
+ ret=$?
+ echo "Generating junit files ..."
+ python tools/dev/gen_junit_report.py
+ --log-file=./tests.log
+ --output-dir=build/junit-reports
+ exit $ret
+ </command>
</hudson.tasks.Shell>
</builders>
<publishers>
<hudson.tasks.junit.JUnitResultArchiver>
- <testResults>subversion-trunk/build/junit-reports/*</testResults>
- <testDataPublishers/>
+ <testResults>subversion-trunk/build/junit-reports/*</testResults>
+ <testDataPublishers />
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.tasks.Mailer>
- <recipients>notifications@subversion.apache.org</recipients>
- <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
- <sendToIndividuals>false</sendToIndividuals>
+ <recipients>notifications@subversion.apache.org</recipients>
+ <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>false</sendToIndividuals>
</hudson.tasks.Mailer>
</publishers>
- <buildWrappers/>
+ <buildWrappers />
</project>
RE: svn commit: r947269 - in /subversion/trunk/build/hudson: ./ jobs/subversion-1.6.x-solaris/ jobs/subversion-1.6.x-ubuntu/ jobs/subversion-doxygen/ jobs/subversion-javadoc/ jobs/subversion-trunk-solaris/ jobs/subversion-trunk-ubuntu/
Posted by "Gav..." <ga...@16degrees.com.au>.
> -----Original Message-----
> From: Bhuvaneswaran A [mailto:bhuvan@collab.net]
> Sent: Monday, 24 May 2010 2:28 PM
> To: dev@subversion.apache.org
> Subject: Re: svn commit: r947269 - in /subversion/trunk/build/hudson:
> ./ jobs/subversion-1.6.x-solaris/ jobs/subversion-1.6.x-ubuntu/
> jobs/subversion-doxygen/ jobs/subversion-javadoc/ jobs/subversion-
> trunk-solaris/ jobs/subversion-trunk-ubuntu/
>
> On Sat, 2010-05-22 at 08:21 +0000, gmcdonald@apache.org wrote:
> > Author: gmcdonald
> > Date: Sat May 22 08:21:07 2010
> > New Revision: 947269
> >
> > URL: http://svn.apache.org/viewvc?rev=947269&view=rev
> > Log:
> > Configs changed for Hudson Builds
>
> Thank you for taking care of this, Gavin!
No problem, I'll try and look at the Windows Build soon.
>
> > Both Solaris builds moved to hudson-solaris.a.o some builds changed
> to
> > point to correct/added to apr/apr-util some needed to point to
> correct
> > sqlite.c rather than use installed binary some dependencies needed
> > installing on some slaves
> >
> > All builds now use a fresh checkout, no need for update mode, doesnt
> > save much
> >
> > Polling times staggered a bit
> >
> > emails re-enabled where it was disabled emails for multiple failing
> > builds disabled, just have the first occurance other tweaks
>
> I don't want to be nitpicky, but please keep the commit log message,
> the subversion way. Specify the changes you did in each configuration
> file, individually.
>
> Refer to this section to know howto write a log message, if you have
> not gone through it already.
> http://subversion.apache.org/docs/community-guide/conventions.html#log-
> messages
Thanks, I hadn't read that (you may have noticed)
Cheers
Gav...
>
> Thank you once again!
>
> --
> Bhuvaneswaran A
> CollabNet Software P Ltd. | www.collab.net
Re: svn commit: r947269 - in /subversion/trunk/build/hudson: ./
jobs/subversion-1.6.x-solaris/ jobs/subversion-1.6.x-ubuntu/
jobs/subversion-doxygen/ jobs/subversion-javadoc/
jobs/subversion-trunk-solaris/ jobs/subversion-trunk-ubuntu/
Posted by Bhuvaneswaran A <bh...@collab.net>.
On Sat, 2010-05-22 at 08:21 +0000, gmcdonald@apache.org wrote:
> Author: gmcdonald
> Date: Sat May 22 08:21:07 2010
> New Revision: 947269
>
> URL: http://svn.apache.org/viewvc?rev=947269&view=rev
> Log:
> Configs changed for Hudson Builds
Thank you for taking care of this, Gavin!
> Both Solaris builds moved to hudson-solaris.a.o
> some builds changed to point to correct/added to apr/apr-util
> some needed to point to correct sqlite.c rather than use installed binary
> some dependencies needed installing on some slaves
>
> All builds now use a fresh checkout, no need for update mode, doesnt save much
>
> Polling times staggered a bit
>
> emails re-enabled where it was disabled
> emails for multiple failing builds disabled, just have the first occurance
> other tweaks
I don't want to be nitpicky, but please keep the commit log message, the
subversion way. Specify the changes you did in each configuration file,
individually.
Refer to this section to know howto write a log message, if you have not
gone through it already.
http://subversion.apache.org/docs/community-guide/conventions.html#log-messages
Thank you once again!
--
Bhuvaneswaran A
CollabNet Software P Ltd. | www.collab.net