Author: asoldano Date: 2015-02-10 08:34:33 -0500 (Tue, 10 Feb 2015) New Revision: 19444 Added: hudson/trunk/hudson-home/jobs/AS-8.2.0-SECMGR/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-SECMGR/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.2.0/ Removed: hudson/trunk/hudson-home/jobs/AS-8.0.0/ hudson/trunk/hudson-home/jobs/AS-8.1.0/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.0.0/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.1.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-8.1.0/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-BINDIST-AS-9.0.0/ hudson/trunk/hudson-home/jobs/CXF-LIGHT/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.0.0/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.1.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-8.1.0/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0-SPRING/ hudson/trunk/hudson-home/jobs/CXF-SRCDIST-AS-9.0.0/ Modified: hudson/trunk/ hudson/trunk/ant.properties.example hudson/trunk/build.xml hudson/trunk/hudson-home/config.xml hudson/trunk/hudson-home/jobs/AS-ALL/config.xml hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml hudson/trunk/scripts/jbossws-qa.sh Log: svn merge -r 19144:HEAD https://svn.jboss.org/repos/jbossws/hudson/branches/arquillian . Property changes on: hudson/trunk ___________________________________________________________________ Added: svn:mergeinfo + /hudson/branches/arquillian:19145-19443 Modified: hudson/trunk/ant.properties.example =================================================================== --- hudson/trunk/ant.properties.example 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/ant.properties.example 2015-02-10 13:34:33 UTC (rev 19444) @@ -17,7 +17,7 @@ hudson.admin.port=8150 hudson.http.port=8180 -hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk +hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/branches/arquillian hudson.jboss800.url=https://github.com/wildfly/wildfly hudson.jboss800.build=wildfly-8.0.0.Final @@ -27,6 +27,10 @@ hudson.jboss810.build=wildfly-8.1.0.Final hudson.jboss810.rev=8.1.0.Final +hudson.jboss820.url=https://github.com/wildfly/wildfly +hudson.jboss820.build=wildfly-8.2.0.Final +hudson.jboss820.rev=8.2.0.Final + hudson.jboss900.url=https://github.com/wildfly/wildfly hudson.jboss900.build=wildfly-9.0.0.Alpha2-SNAPSHOT hudson.jboss900.rev=master Modified: hudson/trunk/build.xml =================================================================== --- hudson/trunk/build.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/build.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -61,7 +61,7 @@ <target name="hudson-tomcat-setup" depends="init-hudson" unless="hudson.tomcat.available"> <get src="http://archive.apache.org/dist/tomcat/tomcat-5/v${apache-tomcat... dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> - <get src="http://hudson-ci.org/downloads/war/${sun-hudson}/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> + <get src="http://hudson-ci.org/downloads/war/archived/${sun-hudson}/hudso... dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> <get src="http://hudson-ci.org/downloads/plugins/git/${git-plugin}/git.hp... dest="${thirdparty.dir}/git.hpi" usetimestamp="true" verbose="true"/> <mkdir dir="${hudson.root}"/> Modified: hudson/trunk/hudson-home/config.xml =================================================================== --- hudson/trunk/hudson-home/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -37,6 +37,7 @@ <tr><td colspan=2></td></tr> <tr><th align=left&gt;@hudson.jboss800.build@&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss800.rev@ @hudson.jboss800.url@</td></tr> <tr><th align=left&gt;@hudson.jboss810.build@&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss810.rev@ @hudson.jboss810.url@</td></tr> + <tr><th align=left&gt;@hudson.jboss820.build@&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss820.rev@ @hudson.jboss820.url@</td></tr> <tr><th align=left&gt;@hudson.jboss900.build@&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss900.rev@ @hudson.jboss900.url@</td></tr> <tr><td colspan=2></td></tr> </table> @@ -54,10 +55,9 @@ <no-comparator/> <string>AS-ALL</string> <string>AS-LIGHT</string> - <string>AS-8.0.0</string> <string>AS-8.0.0-SECMGR</string> - <string>AS-8.1.0</string> <string>AS-8.1.0-SECMGR</string> + <string>AS-8.2.0-SECMGR</string> <string>AS-9.0.0</string> <string>AS-9.0.0-SECMGR</string> </jobNames> @@ -75,28 +75,18 @@ <jobNames class="tree-set"> <no-comparator/> <string>CXF-ALL</string> - <string>CXF-LIGHT</string> - <string>CXF-CORE-AS-8.0.0-SUN-JDK-6</string> + <string>CXF-CORE-AS-8.0.0</string> <string>CXF-CORE-AS-8.0.0-SECMGR</string> - <string>CXF-CORE-AS-8.1.0-SUN-JDK-6</string> + <string>CXF-CORE-AS-8.1.0</string> + <string>CXF-CORE-AS-8.2.0</string> <string>CXF-CORE-AS-8.1.0-SECMGR</string> - <string>CXF-CORE-AS-9.0.0-SUN-JDK-6</string> + <string>CXF-CORE-AS-8.2.0-SECMGR</string> + <string>CXF-CORE-AS-9.0.0</string> <string>CXF-CORE-AS-9.0.0-SECMGR</string> - <string>CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-CORE-AS-8.1.0-SPRING-SUN-JDK-6</string> - <string>CXF-CORE-AS-9.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.0.0-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.1.0-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-9.0.0-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.1.0-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-9.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-8.0.0-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-8.1.0-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-9.0.0-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-8.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-8.1.0-SPRING-SUN-JDK-6</string> - <string>CXF-SRCDIST-AS-9.0.0-SPRING-SUN-JDK-6</string> + <string>CXF-CORE-AS-8.0.0-SPRING</string> + <string>CXF-CORE-AS-8.1.0-SPRING</string> + <string>CXF-CORE-AS-8.2.0-SPRING</string> + <string>CXF-CORE-AS-9.0.0-SPRING</string> </jobNames> <name>CXF Tests</name> <description> @@ -108,37 +98,5 @@ </description> </view> - <!-- Working days tests--> - <view> - <owner reference="../../.."/> - <jobNames class="tree-set"> - <no-comparator/> - <string>CXF-LIGHT</string> - <string>CXF-CORE-AS-8.0.0-SUN-JDK-6</string> - <string>CXF-CORE-AS-8.0.0-SECMGR</string> - <string>CXF-CORE-AS-8.1.0-SUN-JDK-6</string> - <string>CXF-CORE-AS-9.0.0-SECMGR</string> - <string>CXF-CORE-AS-9.0.0-SUN-JDK-6</string> - <string>CXF-CORE-AS-8.1.0-SECMGR</string> - <string>CXF-CORE-AS-8.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-CORE-AS-8.1.0-SPRING-SUN-JDK-6</string> - <string>CXF-CORE-AS-9.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.0.0-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.1.0-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-9.0.0-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.0.0-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-8.1.0-SPRING-SUN-JDK-6</string> - <string>CXF-BINDIST-AS-9.0.0-SPRING-SUN-JDK-6</string> - </jobNames> - <name>Working Days Tests</name> - <description> - <![CDATA[ - Run the working days tests; these include Core and Distro tests for all stacks. - <p/> - Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> -]]> - </description> - </view> - </views> </hudson> Modified: hudson/trunk/hudson-home/jobs/AS-ALL/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/AS-ALL/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-8.0.0, AS-8.1.0, AS-9.0.0, AS-8.0.0-SECMGR, AS-8.1.0-SECMGR, AS-9.0.0-SECMGR</childProjects> + <childProjects>AS-9.0.0, AS-8.0.0-SECMGR, AS-8.1.0-SECMGR, AS-8.2.0-SECMGR, AS-9.0.0-SECMGR</childProjects> <threshold> <name>UNSTABLE</name> <ordinal>1</ordinal> Modified: hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-ALL/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -8,43 +8,25 @@ , CXF-CORE-AS-8.1.0 +, CXF-CORE-AS-8.2.0 + , CXF-CORE-AS-9.0.0 , CXF-CORE-AS-8.0.0-SPRING , CXF-CORE-AS-8.1.0-SPRING +, CXF-CORE-AS-8.2.0-SPRING + , CXF-CORE-AS-9.0.0-SPRING , CXF-CORE-AS-8.0.0-SECMGR , CXF-CORE-AS-8.1.0-SECMGR -, CXF-CORE-AS-9.0.0-SECMGR +, CXF-CORE-AS-8.2.0-SECMGR -, CXF-BINDIST-AS-8.0.0 - -, CXF-BINDIST-AS-8.1.0 - -, CXF-BINDIST-AS-9.0.0 - -, CXF-BINDIST-AS-8.0.0-SPRING - -, CXF-BINDIST-AS-8.1.0-SPRING - -, CXF-BINDIST-AS-9.0.0-SPRING - -, CXF-SRCDIST-AS-8.0.0 - -, CXF-SRCDIST-AS-8.1.0 - -, CXF-SRCDIST-AS-9.0.0 - -, CXF-SRCDIST-AS-8.0.0-SPRING - -, CXF-SRCDIST-AS-8.1.0-SPRING - -, CXF-SRCDIST-AS-9.0.0-SPRING +, CXF-CORE-AS-9.0.0-SECMGR </childProjects> <threshold> <name>UNSTABLE</name> Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,8 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=wildfly800 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/(a)hudson.jboss800.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,7 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS=-Dsecmgr=true JBOSS_TARGET=wildfly800 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0-SECMGR/workspace/build/target/(a)hudson.jboss800.build@ # Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,8 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=wildfly800 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/(a)hudson.jboss800.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,8 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=wildfly810 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.1.0/workspace/build/target/(a)hudson.jboss810.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,7 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS=-Dsecmgr=true JBOSS_TARGET=wildfly810 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.1.0-SECMGR/workspace/build/target/(a)hudson.jboss810.build@ # Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,8 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=wildfly810 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ -JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.1.0/workspace/build/target/(a)hudson.jboss810.build@ # # load test functions Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,7 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=wildfly900 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@ # Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,7 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS=-Dsecmgr=true JBOSS_TARGET=wildfly900 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0-SECMGR/workspace/dist/target/(a)hudson.jboss900.build@ # Modified: hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -15,7 +15,6 @@ STACK_DIR=$WORKSPACE/stack-cxf TEST_OPTS= JBOSS_TARGET=wildfly900 -JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/(a)hudson.jboss900.build@ # Modified: hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/hudson-home/jobs/WORKING-DAYS-MATRIX/config.xml 2015-02-10 13:34:33 UTC (rev 19444) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-LIGHT, CXF-LIGHT</childProjects> + <childProjects>AS-LIGHT, CXF-ALL</childProjects> <threshold> <name>UNSTABLE</name> <ordinal>1</ordinal> Modified: hudson/trunk/scripts/jbossws-qa.sh =================================================================== --- hudson/trunk/scripts/jbossws-qa.sh 2015-02-09 17:20:16 UTC (rev 19443) +++ hudson/trunk/scripts/jbossws-qa.sh 2015-02-10 13:34:33 UTC (rev 19444) @@ -7,14 +7,6 @@ fi } -setupJBossHome() { - rm -rf $WORKSPACE/jboss-as - cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-as - export JBOSS_HOME=$WORKSPACE/jboss-as - echo "Overwriting default application-users.properties / application-roles.properties on AS..." - cp $STACK_DIR/etc/application-*.properties $JBOSS_HOME/standalone/configuration -} - setupEnv() { TMP_DIR_PROPERTY= if [ -d /data/tmp ]; then @@ -25,114 +17,27 @@ echo "Cannot detect temporary directory"; exit -1; fi - - ENVIRONMENT="$TMP_DIR_PROPERTY -Dmaven.opts=-U -Djboss.bind.address=$JBOSS_BIND_ADDRESS -Djbossws.integration.target=$JBOSS_TARGET -D$JBOSS_TARGET.home=$JBOSS_HOME" + if [ "$JBOSS_INSTANCE" != "" ]; then + rm -rf $WORKSPACE/jboss-as + cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-as + export JBOSS_HOME=$WORKSPACE/jboss-as + ENVIRONMENT="$TMP_DIR_PROPERTY -Dmaven.opts=-U -Dserver.home=$JBOSS_HOME" + else + ENVIRONMENT="$TMP_DIR_PROPERTY -Dmaven.opts=-U" + fi } -stopJBoss() { - $SCRIPTS_DIR/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS +logMavenDependencies() { + cd $STACK_DIR + mvn -Ptestsuite,spring,dist clean + mvn -P$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt } -startJBoss() { - $SCRIPTS_DIR/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS -} - -copyJBossLogs() { - if [ -e $JBOSS_HOME/standalone/log/boot.log ]; then - cp $JBOSS_HOME/standalone/log/boot.log $WORKSPACE/jboss-boot.log - fi - cp $JBOSS_HOME/standalone/log/server.log $WORKSPACE/jboss-server.log -} - copyTestLogs() { cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt cat $STACK_DIR/modules/dist/target/exclude-file/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt } -removeJBossLogs() { - rm -f $JBOSS_HOME/standalone/log/boot.log - rm -f $JBOSS_HOME/standalone/log/server.log -} - -ensureRunningJBoss() { - $SCRIPTS_DIR/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE - if [ -e $WORKSPACE/spider.failed ]; then - tail -n 100 $JBOSS_HOME/standalone/log/server.log - stopJBoss - copyJBossLogs - exit 1 - fi -# sleep 5 -} - -logMavenDependencies() { - mvn -Ptestsuite,$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt -} - -deployCoreDistributionWithSpring() { - cd $STACK_DIR - mvn -Ptestsuite,dist,spring clean - ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET -} - -deployCoreDistribution() { - cd $STACK_DIR - mvn -Ptestsuite,dist clean - ant $ENVIRONMENT deploy-$JBOSS_TARGET -} - -deployBinaryDistributionWithSpring() { - cd $STACK_DIR - mvn -Ptestsuite,dist clean - ant $ENVIRONMENT build-bin-dist - cd target - rm -rf jbossws-$STACK_ID-bin-dist - unzip jbossws-$STACK_ID-bin-dist.zip - cd jbossws-$STACK_ID-bin-dist - cp ant.properties.example ant.properties - ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET -} - -deployBinaryDistribution() { - cd $STACK_DIR - mvn -Ptestsuite,dist clean - ant $ENVIRONMENT build-bin-dist - cd target - rm -rf jbossws-$STACK_ID-bin-dist - unzip jbossws-$STACK_ID-bin-dist.zip - cd jbossws-$STACK_ID-bin-dist - cp ant.properties.example ant.properties - ant $ENVIRONMENT deploy-$JBOSS_TARGET -} - -redeployBinaryDistribution() { - cd $STACK_DIR/target/jbossws-$STACK_ID-bin-dist - ant clean - ant $ENVIRONMENT deploy-$JBOSS_TARGET -} - -deploySourceDistributionWithSpring() { - cd $STACK_DIR - mvn -Ptestsuite,dist,spring clean - ant $ENVIRONMENT build-src-dist - cd target - rm -rf jbossws-$STACK_ID-src-dist - unzip jbossws-$STACK_ID-src-dist.zip - cd jbossws-$STACK_ID-src-dist - ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET -} - -deploySourceDistribution() { - cd $STACK_DIR - mvn -Ptestsuite,dist clean - ant $ENVIRONMENT build-src-dist - cd target - rm -rf jbossws-$STACK_ID-src-dist - unzip jbossws-$STACK_ID-src-dist.zip - cd jbossws-$STACK_ID-src-dist - ant $ENVIRONMENT deploy-$JBOSS_TARGET -} - detectFailures() { #rm -rf $WORKSPACE/jboss-as cat $WORKSPACE/tests.log | egrep "BUILD FAILURE|BUILD ERROR|java.lang.OutOfMemoryError" | tee $WORKSPACE/failure.log @@ -143,123 +48,30 @@ } runTestsViaMavenWithSpring() { - mvn $ENVIRONMENT -Ptestsuite,hudson,spring,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log + mvn $ENVIRONMENT -Phudson,spring,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log } runTestsViaMaven() { - mvn $ENVIRONMENT -Ptestsuite,hudson,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log + mvn $ENVIRONMENT -Phudson,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee $WORKSPACE/tests.log } -runTestsViaAnt() { - ant $ENVIRONMENT tests-clean tests $TEST_OPTS 2>&1 | tee $WORKSPACE/tests.log -} - -addTestQueue() { - if [ "$JBOSS_TARGET" != "jboss710" ] && [ "$JBOSS_TARGET" != "jboss711" ]; then - sleep 10 - $JBOSS_HOME/bin/jboss-cli.sh -c command="/subsystem=messaging/hornetq-server=default/jms-queue=testQueue/:add(entries=[\"queue/test\",\"java:jboss/exported/jms/queue/test\"])" - fi -} - coreTestWithSpring() { - setupJBossHome setupEnv ensureJavaExists - stopJBoss - deployCoreDistributionWithSpring - removeJBossLogs - startJBoss - ensureRunningJBoss - addTestQueue +# addTestQueue TODO logMavenDependencies runTestsViaMavenWithSpring copyTestLogs - stopJBoss - copyJBossLogs detectFailures } coreTest() { - setupJBossHome setupEnv ensureJavaExists - stopJBoss - deployCoreDistribution - removeJBossLogs - startJBoss - ensureRunningJBoss logMavenDependencies runTestsViaMaven copyTestLogs - stopJBoss - copyJBossLogs detectFailures } -binaryDistributionTestWithSpring() { - setupJBossHome - setupEnv - ensureJavaExists - stopJBoss - deployBinaryDistributionWithSpring - removeJBossLogs - startJBoss - ensureRunningJBoss - addTestQueue - runTestsViaAnt - copyTestLogs - stopJBoss - copyJBossLogs - detectFailures -} -binaryDistributionTest() { - setupJBossHome - setupEnv - ensureJavaExists - stopJBoss - deployBinaryDistribution - removeJBossLogs - startJBoss - ensureRunningJBoss - runTestsViaAnt - copyTestLogs - stopJBoss - copyJBossLogs - detectFailures -} - -sourceDistributionTestWithSpring() { - setupJBossHome - setupEnv - ensureJavaExists - stopJBoss - deploySourceDistributionWithSpring - removeJBossLogs - startJBoss - ensureRunningJBoss - addTestQueue - logMavenDependencies - runTestsViaMavenWithSpring - copyTestLogs - stopJBoss - copyJBossLogs - detectFailures -} - -sourceDistributionTest() { - setupJBossHome - setupEnv - ensureJavaExists - stopJBoss - deploySourceDistribution - removeJBossLogs - startJBoss - ensureRunningJBoss - logMavenDependencies - runTestsViaMaven - copyTestLogs - stopJBoss - copyJBossLogs - detectFailures -}