2:27 p.m.
Author: jeff.yuchang
Date: 2010-03-02 08:27:07 -0500 (Tue, 02 Mar 2010)
New Revision: 534
Modified:
trunk/integration-tests/build.xml
trunk/qa/hudson-riftsaw-db.sh
trunk/qa/hudson-riftsaw-jboss.sh
trunk/qa/hudson-riftsaw-soa-p.sh
trunk/qa/hudson-riftsaw-ws.sh
Log:
* parameterized the startup wait time.
Modified: trunk/integration-tests/build.xml
===================================================================
--- trunk/integration-tests/build.xml 2010-03-02 06:48:39 UTC (rev 533)
+++ trunk/integration-tests/build.xml 2010-03-02 13:27:07 UTC (rev 534)
@@ -2,6 +2,7 @@
<property environment="env" />
<property name="replace.qa.jdbc" value="true" />
+ <property name="startup.time" value="1" />
<property file="${riftsaw.test.deployment.properties}" />
@@ -80,13 +81,13 @@
<echo>Starting the server</echo>
- <waitfor maxwait="3" maxwaitunit="minute">
+ <waitfor maxwait="4" maxwaitunit="minute">
<socket server="localhost" port="1099"/>
</waitfor>
- <echo>JNP port detected, just waiting for 2 min 30 secs to ensure server
started</echo>
+ <echo>JNP port detected, just waiting for ${startup.time} min 30 secs to ensure
server started</echo>
- <sleep minutes="2" seconds="30" />
+ <sleep minutes="${startup.time}" seconds="30" />
<echo>Server has started</echo>
Modified: trunk/qa/hudson-riftsaw-db.sh
===================================================================
--- trunk/qa/hudson-riftsaw-db.sh 2010-03-02 06:48:39 UTC (rev 533)
+++ trunk/qa/hudson-riftsaw-db.sh 2010-03-02 13:27:07 UTC (rev 534)
@@ -15,7 +15,9 @@
JBOSS_ESB_VERSION="4.7"
JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION"
-ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE
-Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME
-Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION
-Dorg.jboss.esb.home=$JBOSS_ESB_HOME"
+STARTUP_TIME="3"
+
+ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE
-Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME
-Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION
-Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
#build RiftSaw and running unit tests
Modified: trunk/qa/hudson-riftsaw-jboss.sh
===================================================================
--- trunk/qa/hudson-riftsaw-jboss.sh 2010-03-02 06:48:39 UTC (rev 533)
+++ trunk/qa/hudson-riftsaw-jboss.sh 2010-03-02 13:27:07 UTC (rev 534)
@@ -14,7 +14,9 @@
JBOSS_ESB_VERSION="4.7"
JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION"
-ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE
-Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME
-Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION
-Dorg.jboss.esb.home=$JBOSS_ESB_HOME"
+STARTUP_TIME="3"
+
+ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE
-Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME
-Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION
-Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
# build RiftSaw and running unit test
Modified: trunk/qa/hudson-riftsaw-soa-p.sh
===================================================================
--- trunk/qa/hudson-riftsaw-soa-p.sh 2010-03-02 06:48:39 UTC (rev 533)
+++ trunk/qa/hudson-riftsaw-soa-p.sh 2010-03-02 13:27:07 UTC (rev 534)
@@ -15,7 +15,9 @@
JBOSS_ESB_VERSION="4.7"
JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION"
-ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE
-Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME
-Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION
-Dorg.jboss.esb.home=$JBOSS_ESB_HOME"
+STARTUP_TIME="3"
+
+ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE
-Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME
-Dorg.jboss.as.config=$AS_CONFIG -Djbossesb.version=$JBOSS_ESB_VERSION
-Dorg.jboss.esb.home=$JBOSS_ESB_HOME -Dstartup.time=$STARTUP_TIME"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
#build RiftSaw and running unit tests
Modified: trunk/qa/hudson-riftsaw-ws.sh
===================================================================
--- trunk/qa/hudson-riftsaw-ws.sh 2010-03-02 06:48:39 UTC (rev 533)
+++ trunk/qa/hudson-riftsaw-ws.sh 2010-03-02 13:27:07 UTC (rev 534)
@@ -15,7 +15,9 @@
JBOSS_ESB_VERSION="4.7"
JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION"
-ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE
-Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME
-Dorg.jboss.as.config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR
-Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME"
+STARTUP_TIME="3"
+
+ANT_PROPERTIES="-Driftsaw.parent.dir=$RIFTSAW_PARENT_DIR -Ddatabase=$DATABASE
-Dreplace.qa.jdbc=$REPLACE_QA_JDBC -Dorg.jboss.as.home=$AS_HOME
-Dorg.jboss.as.config=$AS_CONFIG -Dws.stack=$WS_STACK -Dws.stack.dir=$WS_STACK_DIR
-Djbossesb.version=$JBOSS_ESB_VERSION -Dorg.jboss.esb.home=$JBOSS_ESB_HOME
-Dstartup.time=$STARTUP_TIME"
echo ANT_PROPERTIES=${ANT_PROPERTIES}
#build RiftSaw and running unit test