Author: alex.guizar(a)jboss.com
Date: 2010-09-01 03:18:28 -0400 (Wed, 01 Sep 2010)
New Revision: 6640
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh
Log:
JBPM-2858 do not read settings file in hudson slaves;
move -s switch off MAVEN_OPTS
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh 2010-09-01 06:47:54 UTC
(rev 6639)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/container.sh 2010-09-01 07:18:28 UTC
(rev 6640)
@@ -49,15 +49,15 @@
fi
# Set up Maven
-export MAVEN_OPTS="-s /dev/null -Ddatabase=$DATABASE -Xms16m -Xmx256m"
+export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m"
cp -u hudson/profiles.redhat.qa.xml profiles.xml
# Determine jBPM version
-mvn -Dexpression=project.version help:evaluate > $WORKSPACE/project-version.txt
+mvn -s /dev/null -Dexpression=project.version help:evaluate >
$WORKSPACE/project-version.txt
JBPM_VERSION=`grep '^3\.' $WORKSPACE/project-version.txt`
# Build jBPM
-mvn -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION -Dcontainer=$CONTAINER \
+mvn -s /dev/null -Pdistro -Djbpm.home=$WORKSPACE/jbpm-$JBPM_VERSION
-Dcontainer=$CONTAINER \
-Djboss.home=$JBOSS_HOME -Djboss.server=$JBOSS_SERVER clean install
if [ $? -ne 0 ]; then
echo "ERROR: failed to build distro"
@@ -77,7 +77,7 @@
fi
# Install proprietary JDBC drivers
-mvn -N -DoutputFile=$WORKSPACE/dependencies.txt dependency:resolve
+mvn -s /dev/null -N -DoutputFile=$WORKSPACE/dependencies.txt dependency:resolve
# DB2 driver
if [ "$DATABASE" = "db2" ]; then
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh 2010-09-01 06:47:54 UTC
(rev 6639)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/standalone.sh 2010-09-01 07:18:28 UTC
(rev 6640)
@@ -21,11 +21,11 @@
fi
# Set up Maven
-export MAVEN_OPTS="-s /dev/null -Ddatabase=$DATABASE -Xms16m -Xmx256m"
+export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m"
cp -u hudson/profiles.redhat.qa.xml profiles.xml
# Build jBPM
-mvn -Pdistro clean install
+mvn -s /dev/null -Pdistro clean install
if [ $? -ne 0 ]; then
echo "ERROR: failed to build distro"
exit 1
@@ -33,4 +33,5 @@
# Run standalone test suite
export JAVA_HOME=$ORIG_JAVA_HOME
-mvn --fail-at-end -Dsurefire.jvm.args="-Xms64m -Xmx256m"
-Dmaven.test.failure.ignore=true test
+mvn -s /dev/null --fail-at-end -Dsurefire.jvm.args="-Xms64m -Xmx256m" \
+ -Dmaven.test.failure.ignore=true test