Author: thomas.diesler(a)jboss.com Date: 2008-04-24 12:18:20 -0400 (Thu, 24 Apr 2008) New Revision: 6670 Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml Log: jboss423 Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml 2008-04-24 16:07:24 UTC (rev 6669) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-4.2.3/config.xml 2008-04-24 16:18:20 UTC (rev 6670) @@ -11,9 +11,10 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework STACKCXF=$WORKSPACE/stack-cxf +JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ -ENVIRONMENT=&amp;quot;-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE&quot; +ENVIRONMENT=&amp;quot;-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE&quot; # # stop jbossas @@ -25,7 +26,7 @@ # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss423 +ant $ENVIRONMENT clean deploy-jboss423 # # start jbossas @@ -43,7 +44,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&amp;1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET 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-cxf/output/tests/test-reports/*.xml</testResults> + <testResults>stack-cxf/**/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/CXF-Distro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-04-24 16:07:24 UTC (rev 6669) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-04-24 16:18:20 UTC (rev 6670) @@ -11,9 +11,10 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework STACKCXF=$WORKSPACE/stack-cxf +JBOSS_TARGET=jboss422 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.2/workspace/JBossAS-4.2.2/build/output/(a)hudson.jboss422.build@ -ENVIRONMENT=&amp;quot;-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE&quot; +ENVIRONMENT=&amp;quot;-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss422.home=$JBOSS_INSTANCE&quot; # # stop jbossas @@ -25,14 +26,13 @@ # cd $STACKCXF 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-cxf-dist -cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT deploy-jboss422 +cd target/jbossws-cxf-dist +ant $ENVIRONMENT deploy-jboss422 # # start jbossas @@ -46,11 +46,11 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi - + # # 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 # Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-04-24 16:07:24 UTC (rev 6669) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-04-24 16:18:20 UTC (rev 6670) @@ -11,9 +11,10 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework STACKCXF=$WORKSPACE/stack-cxf +JBOSS_TARGET=jboss423 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2.3/workspace/JBossAS-4.2.3/build/output/(a)hudson.jboss423.build@ -ENVIRONMENT=&amp;quot;-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE&quot; +ENVIRONMENT=&amp;quot;-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss423.home=$JBOSS_INSTANCE&quot; # # stop jbossas @@ -25,14 +26,13 @@ # cd $STACKCXF 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-cxf-dist -cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT deploy-jboss423 +cd target/jbossws-cxf-dist +ant $ENVIRONMENT deploy-jboss423 # # start jbossas @@ -46,11 +46,11 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi - + # # 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 #