Author: thomas.diesler(a)jboss.com Date: 2007-01-26 03:06:30 -0500 (Fri, 26 Jan 2007) New Revision: 2122 Added: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/ Modified: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml Log: Add views and local jobs Modified: branches/jbossws-1.2.0/build/ant-import/build-hudson.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-26 07:16:33 UTC (rev 2121) +++ branches/jbossws-1.2.0/build/ant-import/build-hudson.xml 2007-01-26 08:06:30 UTC (rev 2122) @@ -66,6 +66,9 @@ <exec executable="basename" outputproperty="svn.basename"> <arg value="${svn.url}"/> </exec> + <exec executable="dirname" outputproperty="svn.basedir.local"> + <arg value="${basedir}"/> + </exec> <!-- Configure Hudson --> <copy todir="${hudson.home}" overwrite="true"> @@ -74,6 +77,7 @@ </fileset> <filterset> <filter token="version.id" value="${version.id}"/> + <filter token="svn.basedir.local" value="${svn.basedir.local}"/> <filter token="svn.basename" value="${svn.basename}"/> <filter token="svn.url" value="${svn.url}"/> <filter token="hudson.home" value="${hudson.home}"/> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-01-26 07:16:33 UTC (rev 2121) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/config.xml 2007-01-26 08:06:30 UTC (rev 2122) @@ -6,23 +6,50 @@ <slaves/> <quietPeriod>5</quietPeriod> <views> + + <!-- JBossAS Testsuite --> <view> <owner reference="../../.."/> <jobNames class="tree-set"> <no-comparator/> - <string>AS-4.0</string> - <string>AS-4.0-jdk14</string> - <string>AS-4.2</string> - <string>AS-5.0</string> - <string>TC-5.5</string> + <string>JBAS-Tests-AS-4.0</string> + <string>JBAS-Tests-AS-4.0-jdk14</string> + <string>JBAS-Tests-AS-4.2</string> + <string>JBAS-Tests-AS-5.0</string> </jobNames> - <name>Target Container</name> - <description>Build the supported target container. A successful build is a prerequisite for any testrun that targets the container.</description> + <name>JBossAS Testsuite</name> + <description> +<![CDATA[ + Run the JBossAS webservice testsuite. + <p/> + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> </view> + + <!-- JBossWS Local Testsuite --> <view> <owner reference="../../.."/> <jobNames class="tree-set"> <no-comparator/> + <string>JBWS-Local-Tests-AS-4.2</string> + <string>JBWS-Local-Tests-AS-5.0</string> + </jobNames> + <name>JBossWS Local Testsuite</name> + <description> +<![CDATA[ + Run the JBossWS local testsuite. + <p/> + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> + </view> + + <!-- JBossWS Testsuite --> + <view> + <owner reference="../../.."/> + <jobNames class="tree-set"> + <no-comparator/> <string>JBWS-Tests-AS-4.0</string> <string>JBWS-Tests-AS-4.0-jdk14</string> <string>JBWS-Tests-AS-4.2</string> @@ -30,24 +57,37 @@ <string>JBWS-Tests-TC-5.5</string> </jobNames> <name>JBossWS Testsuite</name> - <description>Run the JBossWS testsuite.&#x0D; -&lt;p/&gt;&#x0D; -Make sure you have sucessfuly build the &lt;a href=&quot;/hudson/view/Target Container&quot;&gt;Target Container&lt;/a&gt;</description> + <description> +<![CDATA[ + Run the JBossWS testsuite. + <p/> + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> </view> + + <!-- JBossWS Samples --> <view> <owner reference="../../.."/> <jobNames class="tree-set"> <no-comparator/> - <string>JBAS-Tests-AS-4.0</string> - <string>JBAS-Tests-AS-4.0-jdk14</string> - <string>JBAS-Tests-AS-4.2</string> - <string>JBAS-Tests-AS-5.0</string> + <string>JBWS-Samples-AS-4.0</string> + <string>JBWS-Samples-AS-4.0-jdk14</string> + <string>JBWS-Samples-AS-4.2</string> + <string>JBWS-Samples-AS-5.0</string> + <string>JBWS-Samples-TC-5.5</string> </jobNames> - <name>JBossAS Testsuite</name> - <description>Run the JBossAS webservice testsuite.&#x0D; -&lt;p/&gt;&#x0D; -Make sure you have sucessfuly build the &lt;a href=&quot;/hudson/view/Target Container&quot;&gt;Target Container&lt;/a&gt;</description> + <name>JBossWS Samples</name> + <description> +<![CDATA[ + Run the JBossWS samples. + <p/> + Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> +]]> + </description> </view> + + <!-- Release QA --> <view> <owner reference="../../.."/> <jobNames class="tree-set"> @@ -56,32 +96,40 @@ <string>Release-Matrix-Step2</string> </jobNames> <name>Release QA</name> - <description>A collection of jobs that covers the JBossWS release matrix&#x0D; -&lt;p/&gt;&#x0D; -&#x0D; -&lt;table border=1&gt;&#x0D; -&lt;tr&gt;&lt;th&gt; &lt;/th&gt;&lt;th&gt;JBWS-Tests&lt;/th&gt;&lt;th&gt;JBAS-Tests&lt;/th&gt;&lt;th&gt;JBWS-Samples&lt;/th&gt;&lt;/tr&gt;&#x0D; -&lt;tr align=center&gt;&lt;th align=left&gt;AS-5.0&lt;/th&gt;&lt;td&gt;ok&lt;/td&gt;&lt;td&gt;ok&lt;/td&gt;&lt;td&gt;ok&lt;/td&gt;&lt;/tr&gt;&#x0D; -&lt;tr align=center&gt;&lt;th align=left&gt;AS-4.2&lt;/th&gt;&lt;td&gt;ok&lt;/td&gt;&lt;td&gt;ok&lt;/td&gt;&lt;td&gt;ok&lt;/td&gt;&lt;/tr&gt;&#x0D; -&lt;tr align=center&gt;&lt;th align=left&gt;AS-4.0&lt;/th&gt;&lt;td&gt;ok&lt;/td&gt;&lt;td&gt;ok&lt;/td&gt;&lt;td&gt;ok&lt;/td&gt;&lt;/tr&gt;&#x0D; -&lt;tr align=center&gt;&lt;th align=left&gt;AS-4.0-jdk14&lt;/th&gt;&lt;td&gt;ok&lt;/td&gt;&lt;td&gt;ok&lt;/td&gt;&lt;td&gt;N/A&lt;/td&gt;&lt;/tr&gt;&#x0D; -&lt;tr align=center&gt;&lt;th align=left&gt;TC-5.5&lt;/th&gt;&lt;td&gt;ok&lt;/td&gt;&lt;td&gt;ok&lt;/td&gt;&lt;td&gt;ok&lt;/td&gt;&lt;/tr&gt;&#x0D; -&lt;/table&gt;</description> + <description> +<![CDATA[ +A collection of jobs that covers the JBossWS release matrix. +<p/> +<table border=1> +<tr><th>&nbsp;</th><th>JBWS-Tests</th><th>JBAS-Tests</th><th>JBWS-Samples</th></tr> +<tr align=center><th align=left>AS-5.0</th><td>ok</td><td>ok</td><td>ok</td></tr> +<tr align=center><th align=left>AS-4.2</th><td>ok</td><td>ok</td><td>ok</td></tr> +<tr align=center><th align=left>AS-4.0</th><td>ok</td><td>ok</td><td>ok</td></tr> +<tr align=center><th align=left>AS-4.0-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr> +<tr align=center><th align=left>TC-5.5</th><td>ok</td><td>ok</td><td>ok</td></tr> +</table> +]]> + </description> </view> + + <!-- Target Container --> <view> <owner reference="../../.."/> <jobNames class="tree-set"> <no-comparator/> - <string>JBWS-Samples-AS-4.0</string> - <string>JBWS-Samples-AS-4.0-jdk14</string> - <string>JBWS-Samples-AS-4.2</string> - <string>JBWS-Samples-AS-5.0</string> - <string>JBWS-Samples-TC-5.5</string> + <string>AS-4.0</string> + <string>AS-4.0-jdk14</string> + <string>AS-4.2</string> + <string>AS-5.0</string> + <string>TC-5.5</string> </jobNames> - <name>JBossWS Samples</name> - <description>Run the JBossWS samples.&#x0D; -&lt;p/&gt;&#x0D; -Make sure you have sucessfuly build the &lt;a href=&quot;/hudson/view/Target Container&quot;&gt;Target Container&lt;/a&gt;</description> + <name>Target Container</name> + <description> +<![CDATA[ + Build the supported target container. A successful build is a prerequisite for any testrun that targets the container. +]]> + </description> </view> + </views> </hudson> \ No newline at end of file Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2 (from rev 2119, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2) Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-01-25 20:59:07 UTC (rev 2119) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-01-26 08:06:30 UTC (rev 2122) @@ -6,20 +6,14 @@ # # Module settings # -MODULE=JBWS-Tests-AS-4.2 +MODULE=JBWS-Local-Tests-AS-4.2 SVNBASENAME=(a)svn.basename@ WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ +SVNBASEDIR=(a)svn.basedir.local@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 ENVIRONMENT=&quot;-Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE&quot; # -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# # stop jbossas # $SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop @@ -27,6 +21,7 @@ # # deploy to jboss # +cd $SVNBASEDIR/build ant $ENVIRONMENT clean deploy-jboss42 # @@ -50,7 +45,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults&gt;@svn.basename(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; + <testResults&gt;@svn.basedir.local(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; @@ -59,15 +54,16 @@ </hudson.tasks.Mailer> </publishers> <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules&gt;@svn.url(a)&lt;/modules&gt; - <useUpdate>true</useUpdate> - </scm> + <scm class="hudson.scm.NullSCM"/> <canRoam>true</canRoam> <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against AS-4.2</description> + <description> + Build and test the local jbossws-(a)version.id@ against AS-4.2 + &lt;p/&gt; + Local SVN dir: @svn.basedir.local@ + </description> <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> Copied: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0 (from rev 2119, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0) Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-01-25 20:59:07 UTC (rev 2119) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-01-26 08:06:30 UTC (rev 2122) @@ -6,20 +6,14 @@ # # Module settings # -MODULE=JBWS-Tests-AS-5.0 +MODULE=JBWS-Local-Tests-AS-5.0 SVNBASENAME=(a)svn.basename@ WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ +SVNBASEDIR=(a)svn.basedir.local@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ ENVIRONMENT=&quot;-Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE&quot; # -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# # stop jbossas # $SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop @@ -27,6 +21,7 @@ # # deploy to jboss # +cd $SVNBASEDIR/build ant $ENVIRONMENT clean deploy-jboss50 # @@ -50,7 +45,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults&gt;@svn.basename(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; + <testResults&gt;@svn.basedir.local(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; @@ -59,15 +54,16 @@ </hudson.tasks.Mailer> </publishers> <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules&gt;@svn.url(a)&lt;/modules&gt; - <useUpdate>true</useUpdate> - </scm> + <scm class="hudson.scm.NullSCM"/> <canRoam>true</canRoam> <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against AS-5.0</description> + <description> + Build and test the local jbossws-(a)version.id@ against AS-5.0 + &lt;p/&gt; + Local SVN dir: @svn.basedir.local@ + </description> <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/> Modified: branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-01-26 07:16:33 UTC (rev 2121) +++ branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/Release-Matrix-Step1/config.xml 2007-01-26 08:06:30 UTC (rev 2122) @@ -14,7 +14,7 @@ <disabled>false</disabled> <enableRemoteTrigger>false</enableRemoteTrigger> <triggers class="vector"/> - <description>Build the relase matrix target container</description> + <description>Build the relase matrix target containers.</description> <keepDependencies>false</keepDependencies> <properties/> <actions class="vector"/>