Author: alessio.soldano(a)jboss.com
Date: 2011-03-08 13:45:04 -0500 (Tue, 08 Mar 2011)
New Revision: 13871
Modified:
hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml
hudson/trunk/scripts/jbossws-qa.sh
Log:
[JBWS-3080] Some updates to hudson configuration for always cleaning the dist module too
and skipping looking for test-excludes in AS TEST job
Modified: hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml
===================================================================
--- hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2011-03-08 18:31:39 UTC
(rev 13870)
+++ hudson/trunk/hudson-home/jobs/AS-TESTS-AS-6.0.0/config.xml 2011-03-08 18:45:04 UTC
(rev 13871)
@@ -61,7 +61,6 @@
#
./build.sh -Dnode0=$JBOSS_BIND_ADDRESS init tests-webservice tests-ws tests-report
2>&1 | tee $WORKSPACE/tests.log
cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt |
egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt
#
# copy the test reports
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2011-03-08 18:31:39 UTC (rev 13870)
+++ hudson/trunk/scripts/jbossws-qa.sh 2011-03-08 18:45:04 UTC (rev 13871)
@@ -81,19 +81,19 @@
deployCoreDistributionWithSpring() {
cd $STACK_DIR
- mvn -Ptestsuite,spring clean
+ mvn -Ptestsuite,dist,spring clean
ant $ENVIRONMENT -Dspring=true deploy-$JBOSS_TARGET
}
deployCoreDistribution() {
cd $STACK_DIR
- mvn -Ptestsuite clean
+ mvn -Ptestsuite,dist clean
ant $ENVIRONMENT deploy-$JBOSS_TARGET
}
deployBinaryDistributionWithSpring() {
cd $STACK_DIR
- mvn -Ptestsuite clean
+ mvn -Ptestsuite,dist clean
ant $ENVIRONMENT build-bin-dist
cd target
rm -rf jbossws-$STACK_ID-bin-dist
@@ -105,7 +105,7 @@
deployBinaryDistribution() {
cd $STACK_DIR
- mvn -Ptestsuite clean
+ mvn -Ptestsuite,dist clean
ant $ENVIRONMENT build-bin-dist
cd target
rm -rf jbossws-$STACK_ID-bin-dist
@@ -123,7 +123,7 @@
deploySourceDistributionWithSpring() {
cd $STACK_DIR
- mvn -Ptestsuite,spring clean
+ mvn -Ptestsuite,dist,spring clean
ant $ENVIRONMENT build-src-dist
cd target
rm -rf jbossws-$STACK_ID-src-dist
@@ -134,7 +134,7 @@
deploySourceDistribution() {
cd $STACK_DIR
- mvn -Ptestsuite clean
+ mvn -Ptestsuite,dist clean
ant $ENVIRONMENT build-src-dist
cd target
rm -rf jbossws-$STACK_ID-src-dist