Author: thomas.diesler(a)jboss.com Date: 2008-05-01 17:12:37 -0400 (Thu, 01 May 2008) New Revision: 6837 Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml Log: Switch to maven build Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml 2008-05-01 21:08:04 UTC (rev 6836) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-4.2.1/config.xml 2008-05-01 21:12:37 UTC (rev 6837) @@ -11,9 +11,10 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native +JBOSS_TARGET=jboss421 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@ -ENVIRONMENT=&amp;quot;-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss421 -Djboss421.home=$JBOSS_INSTANCE&quot; +ENVIRONMENT=&amp;quot;-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss421.home=$JBOSS_INSTANCE&quot; # # stop jbossas @@ -25,7 +26,7 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss421 +ant $ENVIRONMENT clean deploy-jboss421 # # start jbossas @@ -43,7 +44,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET clean test 2>&amp;1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # @@ -57,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/test-reports/TEST-*.xml</testResults> + <testResults>stack-native/**/target/surefire-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2008-05-01 21:08:04 UTC (rev 6836) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2008-05-01 21:12:37 UTC (rev 6837) @@ -11,9 +11,10 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native +JBOSS_TARGET=jboss421 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@ -ENVIRONMENT=&amp;quot;-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss421 -Djboss421.home=$JBOSS_INSTANCE&quot; +ENVIRONMENT=&amp;quot;-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss421.home=$JBOSS_INSTANCE&quot; # # stop jbossas @@ -25,14 +26,13 @@ # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist +ant $ENVIRONMENT clean build-bin-dist # # Deploy distro # -cd output/jbossws-native-dist -cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT deploy-jboss421 +cd target/jbossws-native-dist +ant $ENVIRONMENT deploy-jboss421 # # start jbossas @@ -50,7 +50,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.log +ant $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # @@ -64,7 +64,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/jbossws-native-dist/output/test-reports/TEST-*.xml</testResults> + <testResults>stack-native/target/jbossws-native-dist/output/test-reports/TEST-*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml 2008-05-01 21:08:04 UTC (rev 6836) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.1/config.xml 2008-05-01 21:12:37 UTC (rev 6837) @@ -11,9 +11,10 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework STACKNATIVE=$WORKSPACE/stack-native +JBOSS_TARGET=jboss421 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.1/workspace/JBossAS-4.2.1/build/output/(a)hudson.jboss421.build@ -ENVIRONMENT=&amp;quot;-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss421 -Djboss421.home=$JBOSS_INSTANCE&quot; +ENVIRONMENT=&amp;quot;-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss421.home=$JBOSS_INSTANCE&quot; # # stop jbossas @@ -21,11 +22,11 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # -# build and deploy +# build and deploy # cd $STACKNATIVE cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss421 +ant $ENVIRONMENT clean deploy-jboss421 # # start jbossas @@ -43,7 +44,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-integration 2>&amp;1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET -Dtest=jaxws/samples/**/*TestCase clean test 2>&amp;1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # @@ -57,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-native/output/tests/test-reports/TEST-*.xml</testResults> + <testResults>stack-native/**/target/surefire-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt;