Author: thomas.diesler(a)jboss.com Date: 2007-03-10 14:22:31 -0500 (Sat, 10 Mar 2007) New Revision: 2584 Modified: trunk/build/ant-import/build-hudson.xml trunk/build/hudson/hudson-home/config.xml trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml Log: verify jboss build name Modified: trunk/build/ant-import/build-hudson.xml =================================================================== --- trunk/build/ant-import/build-hudson.xml 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/build/ant-import/build-hudson.xml 2007-03-10 19:22:31 UTC (rev 2584) @@ -83,8 +83,24 @@ <fileset dir="${build.dir}/hudson/hudson-home"> <include name="jobs/AS-5.0/**"/> <include name="jobs/AS-4.2/**"/> + <include name="jobs/AS-4.0/**"/> + <include name="jobs/AS-4.0.5/**"/> + <include name="jobs/TC-5.5/**"/> + <include name="jobs/JBWS-Samples-AS-5.0/**"/> + <include name="jobs/JBWS-Samples-AS-4.2/**"/> + <include name="jobs/JBWS-Samples-AS-4.0/**"/> + <include name="jobs/JBWS-Samples-AS-4.0.5/**"/> + <include name="jobs/JBWS-Samples-TC-5.5/**"/> <include name="jobs/JBWS-Tests-AS-5.0/**"/> <include name="jobs/JBWS-Tests-AS-4.2/**"/> + <include name="jobs/JBWS-Tests-AS-4.0/**"/> + <include name="jobs/JBWS-Tests-AS-4.0.5/**"/> + <include name="jobs/JBWS-Tests-TC-5.5/**"/> + <include name="jobs/JBAS-Tests-AS-5.0/**"/> + <include name="jobs/JBAS-Tests-AS-4.2/**"/> + <include name="jobs/JBAS-Tests-AS-4.0/**"/> + <include name="jobs/Release-Matrix-Step1/**"/> + <include name="jobs/Release-Matrix-Step2/**"/> <include name="users/**"/> <include name="*.xml"/> </fileset> Modified: trunk/build/hudson/hudson-home/config.xml =================================================================== --- trunk/build/hudson/hudson-home/config.xml 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/build/hudson/hudson-home/config.xml 2007-03-10 19:22:31 UTC (rev 2584) @@ -34,7 +34,7 @@ <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.0-jdk14</string--> <string>JBAS-Tests-AS-4.2</string> <string>JBAS-Tests-AS-5.0</string> </jobNames> @@ -48,7 +48,7 @@ </description> </view> - <!-- JBossWS Local Testsuite --> + <!-- JBossWS Local Testsuite <view> <owner reference="../../.."/> <jobNames class="tree-set"> @@ -67,6 +67,7 @@ ]]> </description> </view> + --> <!-- JBossWS Testsuite --> <view> @@ -74,9 +75,9 @@ <jobNames class="tree-set"> <no-comparator/> <string>JBWS-Tests-AS-4.0.5</string> - <string>JBWS-Tests-AS-4.0.5-jdk14</string> + <!--string>JBWS-Tests-AS-4.0.5-jdk14</string--> <string>JBWS-Tests-AS-4.0</string> - <string>JBWS-Tests-AS-4.0-jdk14</string> + <!--string>JBWS-Tests-AS-4.0-jdk14</string--> <string>JBWS-Tests-AS-4.2</string> <string>JBWS-Tests-AS-5.0</string> <string>JBWS-Tests-TC-5.5</string> @@ -147,9 +148,9 @@ <string>AS-5.0</string> <string>AS-4.2</string> <string>AS-4.0</string> - <string>AS-4.0-jdk14</string> + <!--string>AS-4.0-jdk14</string--> <string>AS-4.0.5</string> - <string>AS-4.0.5-jdk14</string> + <!--string>AS-4.0.5-jdk14</string--> <string>TC-5.5</string> </jobNames> <name>Target Container</name> Modified: trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/build/hudson/hudson-home/jobs/AS-4.0/config.xml 2007-03-10 19:22:31 UTC (rev 2584) @@ -24,8 +24,16 @@ cd $SVNBASE rm -f thirdparty/libraries.ent ./build/build.sh clean main - + # +# Verify build +# +if [ ! -d ./build/output/@hudson.jboss40.build(a)-ejb3 ]; then + warn "Cannot find expected build: @hudson.jboss40.build@-ejb3" + exit 1 +fi + +# # build the testsuite # cd testsuite Modified: trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/build/hudson/hudson-home/jobs/AS-4.0-jdk14/config.xml 2007-03-10 19:22:31 UTC (rev 2584) @@ -28,6 +28,14 @@ ./build/build.sh clean main # +# Verify build +# +if [ ! -d ./build/output/(a)hudson.jboss40.build@ ]; then + warn "Cannot find expected build: @hudson.jboss40.build@" + exit 1 +fi + +# # build the testsuite # cd testsuite Modified: trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-03-10 19:22:31 UTC (rev 2584) @@ -26,6 +26,14 @@ ./build/build.sh clean main # +# Verify build +# +if [ ! -d ./build/output/(a)hudson.jboss42.build@ ]; then + warn "Cannot find expected build: @hudson.jboss42.build@" + exit 1 +fi + +# # build the testsuite # cd testsuite Modified: trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-03-10 17:17:10 UTC (rev 2583) +++ trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-03-10 19:22:31 UTC (rev 2584) @@ -26,6 +26,14 @@ ./build/build.sh clean main # +# Verify build +# +if [ ! -d ./build/output/(a)hudson.jboss50.build@ ]; then + warn "Cannot find expected build: @hudson.jboss50.build@" + exit 1 +fi + +# # build the testsuite # cd testsuite