[jbossws-commits] JBossWS SVN: r19147 - in hudson/branches/arquillian: hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR and 8 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Dec 15 13:13:03 EST 2014
Author: asoldano
Date: 2014-12-15 13:13:02 -0500 (Mon, 15 Dec 2014)
New Revision: 19147
Modified:
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml
hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml
hudson/branches/arquillian/scripts/jbossws-qa.sh
Log:
Fixing jobs to use new build commands
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,8 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=
JBOSS_TARGET=wildfly800
-JBOSS_BIND_ADDRESS=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/@hudson.jboss800.build@
#
# load test functions
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SECMGR/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,7 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=-Dsecmgr=true
JBOSS_TARGET=wildfly800
-JBOSS_BIND_ADDRESS=@jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0-SECMGR/workspace/build/target/@hudson.jboss800.build@
#
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.0.0-SPRING/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,8 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=
JBOSS_TARGET=wildfly800
-JBOSS_BIND_ADDRESS=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.0.0/workspace/build/target/@hudson.jboss800.build@
#
# load test functions
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,8 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=
JBOSS_TARGET=wildfly810
-JBOSS_BIND_ADDRESS=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.1.0/workspace/build/target/@hudson.jboss810.build@
#
# load test functions
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SECMGR/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,7 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=-Dsecmgr=true
JBOSS_TARGET=wildfly810
-JBOSS_BIND_ADDRESS=@jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.1.0-SECMGR/workspace/build/target/@hudson.jboss810.build@
#
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-8.1.0-SPRING/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,8 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=
JBOSS_TARGET=wildfly810
-JBOSS_BIND_ADDRESS=@jboss.bind.address@
-JBOSS_INSTANCE=@hudson.home@/jobs/AS-8.1.0/workspace/build/target/@hudson.jboss810.build@
#
# load test functions
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,7 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=
JBOSS_TARGET=wildfly900
-JBOSS_BIND_ADDRESS=@jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/@hudson.jboss900.build@
#
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SECMGR/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,7 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=-Dsecmgr=true
JBOSS_TARGET=wildfly900
-JBOSS_BIND_ADDRESS=@jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0-SECMGR/workspace/dist/target/@hudson.jboss900.build@
#
Modified: hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml
===================================================================
--- hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/hudson-home/jobs/CXF-CORE-AS-9.0.0-SPRING/config.xml 2014-12-15 18:13:02 UTC (rev 19147)
@@ -15,7 +15,6 @@
STACK_DIR=$WORKSPACE/stack-cxf
TEST_OPTS=
JBOSS_TARGET=wildfly900
-JBOSS_BIND_ADDRESS=@jboss.bind.address@
JBOSS_INSTANCE=@hudson.home@/jobs/AS-9.0.0/workspace/dist/target/@hudson.jboss900.build@
#
Modified: hudson/branches/arquillian/scripts/jbossws-qa.sh
===================================================================
--- hudson/branches/arquillian/scripts/jbossws-qa.sh 2014-12-15 18:12:34 UTC (rev 19146)
+++ hudson/branches/arquillian/scripts/jbossws-qa.sh 2014-12-15 18:13:02 UTC (rev 19147)
@@ -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"
-}
-
-stopJBoss() {
- $SCRIPTS_DIR/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS
-}
-
-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
+ 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
- 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
+ mvn -P$JBOSS_TARGET dependency:tree | tee $WORKSPACE/dependency-tree.txt
}
-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
+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
}
-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
-}
More information about the jbossws-commits
mailing list