[jbpm-commits] JBoss JBPM SVN: r6858 - jbpm3/branches/jbpm-3.2-soa/ci.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Dec 2 20:06:53 EST 2010
Author: alex.guizar at jboss.com
Date: 2010-12-02 20:06:53 -0500 (Thu, 02 Dec 2010)
New Revision: 6858
Modified:
jbpm3/branches/jbpm-3.2-soa/ci/container.sh
jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh
Log:
remove JAVA_HOME switch commands from standalone.sh, JDK 1.4.2 is enough to run maven test goal;
reintroduce surefire.jvm.args property to container.sh due to OOMEs in Hudson build
Modified: jbpm3/branches/jbpm-3.2-soa/ci/container.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/ci/container.sh 2010-12-02 04:35:32 UTC (rev 6857)
+++ jbpm3/branches/jbpm-3.2-soa/ci/container.sh 2010-12-03 01:06:53 UTC (rev 6858)
@@ -63,7 +63,7 @@
[ -z $MAVEN_SETTINGS ] && MAVEN_SETTINGS=ci/settings-qa.xml
# Display Maven version
-mvn -v
+mvn -s $MAVEN_SETTINGS -v
# Determine jBPM version
mvn -s $MAVEN_SETTINGS -Dexpression=project.version help:evaluate > $WORKSPACE/version.txt
@@ -147,25 +147,30 @@
# BEGIN section taken from run.sh
# Force IPv4 on Linux systems since IPv6 doesn't work correctly with jdk5 and lower
-JAVA_OPTS="-Djava.net.preferIPv4Stack=true"
+JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
# Setup the classpath
runjar="$JBOSS_HOME/bin/run.jar"
if [ ! -f "$runjar" ]; then
die "Missing required file: $runjar"
fi
-JBOSS_CLASSPATH="$runjar"
+JBOSS_BOOT_CLASSPATH="$runjar"
+if [ -z "$JBOSS_CLASSPATH" ]; then
+ JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH"
+else
+ JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH"
+fi
+
# Setup JBoss specific properties
JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS"
-# Setup the java endorsed dirs
-JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
-
# Execute the JVM in the background
-$JAVA $JAVA_OPTS -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" -classpath "$JBOSS_CLASSPATH" \
- org.jboss.Main -b $MYTESTIP_1 -c $JBOSS_SERVER -g jbpm3-$CONTAINER-$DATABASE -u $MCAST_ADDR \
- &> /dev/null &
+$JAVA $JAVA_OPTS \
+ -Djava.endorsed.dirs="$JBOSS_HOME/lib/endorsed" \
+ -classpath "$JBOSS_CLASSPATH" \
+ org.jboss.Main -b $MYTESTIP_1 -c $JBOSS_SERVER \
+ -g jbpm3-$CONTAINER-$DATABASE -u $MCAST_ADDR &> /dev/null &
JBOSS_PID=$!
# END section adapted from run.sh
@@ -189,7 +194,7 @@
# Run enterprise test suite
mvn -f enterprise/pom.xml -s $MAVEN_SETTINGS -Djboss.bind.address=$MYTESTIP_1 \
- verify | tee $WORKSPACE/tests.log
+ -Dsurefire.jvm.args=-Xmx256m integration-test | tee $WORKSPACE/tests.log
# Stop JBoss AS
$JBOSS_HOME/bin/shutdown.sh -s jnp://$MYTESTIP_1:1099 -S
Modified: jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh 2010-12-02 04:35:32 UTC (rev 6857)
+++ jbpm3/branches/jbpm-3.2-soa/ci/standalone.sh 2010-12-03 01:06:53 UTC (rev 6858)
@@ -4,30 +4,16 @@
#
# Environment variables
# JAVA_HOME JDK location
-# JAVA_15_HOME JDK 1.5 location; required if JAVA_HOME points to JDK 1.4
# DATABASE one of db2, hsqldb, mssql, mysql, oracle, postgresql
# MAVEN_SETTINGS Maven settings file; optional, defaults to ci/settings-qa.xml
-# Determine Java platform version
-JAVA=$JAVA_HOME/bin/java
-JAVA_VERSION=`$JAVA -version 2>&1 | grep version | awk '{ print substr($3, 2, 3); }'`
-
-if [ $JAVA_VERSION = 1.4 ]; then
- ORIG_JAVA_HOME=$JAVA_HOME
- JAVA=$JAVA_15_HOME/bin/java
- export JAVA_HOME=$JAVA_15_HOME
-else
- ORIG_JAVA_HOME=$JAVA_HOME
-fi
-
# Set up Maven
-export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m"
[ -z $MAVEN_SETTINGS ] && MAVEN_SETTINGS=ci/settings-qa.xml
+export MAVEN_OPTS="-Ddatabase=$DATABASE -Xms16m -Xmx256m"
# Display Maven version
-mvn -v
+mvn -s $MAVEN_SETTINGS -v
# Run standalone test suite
-export JAVA_HOME=$ORIG_JAVA_HOME
-mvn -U -s $MAVEN_SETTINGS -Dsurefire.jvm.args="-Xms64m -Xmx256m" \
- -Dmaven.test.failure.ignore=true clean test
+mvn -s $MAVEN_SETTINGS -U -Dsurefire.jvm.args=-Xmx256m \
+ -Dmaven.test.failure.ignore=true clean test
More information about the jbpm-commits
mailing list