From 1c38a69e4f1a1c47b3aff334458a9bea3b704305 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Mon, 17 Oct 2011 13:04:06 +0000
Subject: Added random delay before starting the quicker servers to avoid
 contention in the beginning Automatically update more base files before
 starting the actual tests

svn changeset:21719/svn branch:6.7
---
 tests/deploy-base.xml                    | 113 -------------------------------
 tests/integration_base_files/base.xml    | 113 +++++++++++++++++++++++++++++++
 tests/integration_base_files/cleanup.sh  |  21 ++++++
 tests/integration_base_files/lock_age.sh |  16 +++++
 tests/integration_tests.xml              |  36 +++++++++-
 5 files changed, 184 insertions(+), 115 deletions(-)
 delete mode 100644 tests/deploy-base.xml
 create mode 100644 tests/integration_base_files/base.xml
 create mode 100644 tests/integration_base_files/cleanup.sh
 create mode 100644 tests/integration_base_files/lock_age.sh

diff --git a/tests/deploy-base.xml b/tests/deploy-base.xml
deleted file mode 100644
index a44b5d0133..0000000000
--- a/tests/deploy-base.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0"?>
-<project name="test" basedir=".">
-	<property file="deploy.properties" />
-    <property name="lock" value="deploy/lock.file" />
-    <property name="deployDir" value="deploy/${server}" />
-    <property name="serverPort" value="8080" />
-    <property name="war" value="demo.war" />
-    <property name="startupSpawn" value="false" />
-    <property name="JAVA_HOME" value="/usr/lib/jvm/default-java" />
-	<property name="waitMinutes" value="3" />
-    <property name="waitUrl" value="http://localhost:${serverPort}/demo/VAADIN/themes/reindeer/styles.css" />
-
-    
-    <target name="afterDeploy">
-    	<!-- Empty default -->
-    </target>
-    
-    <target name="beforeDeploy">
-    	<!-- Empty default -->
-    </target>
-    
-	<target name="deploy">
-		<antcall target="beforeDeploy" />
-	 	<echo message="${server}: Deploying ${war} to ${deployDir}/${autodeployDir}" />
-		<copy file="${war}" todir="${deployDir}/${autodeployDir}"/>
-		<antcall target="afterDeploy" />
-	</target>
-
-	<target name="deployStatic">
-		<unzip src="${war}" dest="${staticDeployDir}">
-			<patternset>
-				<include name="VAADIN/**" />
-			</patternset>
-		</unzip>
-	</target>    
-    
-	 <target name="unpack-server">
-	 	<echo message="${server}: Unpacking ${server}.tar.gz" />
-	 	<delete dir="${server}" />
-		<exec executable="tar">
-		      <arg value="-xf"/>
-		      <arg value="${server}.tar.gz"/>
-		</exec>
-		<move file="${server}" tofile="${deployDir}" />
-		<echo message="Done." />
-	</target>
-	
-	<target name="doStartup">
-		<exec executable="./run.sh" spawn="${startupSpawn}">
-			<env key="JAVA_HOME" value="${JAVA_HOME}" />
-		</exec>
-	</target>
-	
-	<target name="startup">
-		<antcall target="doStartup" />
-		<echo message="${server}: Waiting for ${waitUrl} to become available." />
-		<waitfor maxwait="${waitMinutes}" maxwaitunit="minute" checkevery="10000" timeoutproperty="timeout">
-			 <http url="${waitUrl}" />
-		</waitfor>
-		<fail if="timeout" message="${server} failed to deploy" />
-
-		<echo message="${server}: Demo deployed successfully." />
-	</target>
-	
-	<target name="shutdown">
-		<exec executable="./stop.sh" >
-			<env key="JAVA_HOME" value="${JAVA_HOME}" />
-		</exec>
-		<sleep seconds="15" />
-	</target>
-	
-	<target name="check-port">
-		<fail message="Something is still listening on port ${serverPort}">
-			<condition>
-				<socket server="localhost" port="${serverPort}" />
-			</condition>
-		</fail>
-	</target>
-	
-	<target name="check-lock">
-	  <available file="${lock}" property="lockAvailable" />
-	  <fail unless="lockAvailable" message="Instance is not locked!" />
-  	</target>
-	 
-	 <target name="get-lock">
-	 	<mkdir dir="deploy" /> 
-	 	<exec executable="lockfile">
-	 		<arg value="${lock}" />
-	 	</exec>
-	 	<echo>${server}: Got the lock</echo>
-	 </target>
-	 
-	 <target name="clean">
-		<delete dir="${deployDir}" />
-	 </target>
-	 
-	 <target name="release-lock">
-<!--	 	<exec executable="rm">
-	 		<arg value="-f" />
-	 		<arg value="${lock}" />
-	 	</exec> -->
-	 	 <delete>
-		 	 <fileset dir="." includes="${lock}" />
-		 </delete>
-	 	<echo>${server}: Released the lock</echo>
-	 </target>
-	 
-	<target name="startup-and-deploy" depends="check-lock,check-port,unpack-server,deploy,startup" />
-	
-	<target name="shutdown-and-cleanup" depends="shutdown,clean,release-lock" />
-	 
-	 
-</project>
diff --git a/tests/integration_base_files/base.xml b/tests/integration_base_files/base.xml
new file mode 100644
index 0000000000..20fe8b2d8d
--- /dev/null
+++ b/tests/integration_base_files/base.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0"?>
+<project name="test" basedir=".">
+	<property file="deploy.properties" />
+    <property name="lock" value="deploy/lock.file" />
+    <property name="deployDir" value="deploy/${server}" />
+    <property name="serverPort" value="8080" />
+    <property name="war" value="demo.war" />
+    <property name="startupSpawn" value="false" />
+    <property name="JAVA_HOME" value="/usr/lib/jvm/default-java" />
+	<property name="waitMinutes" value="3" />
+    <property name="waitUrl" value="http://localhost:${serverPort}/demo/VAADIN/themes/reindeer/styles.css" />
+
+    
+    <target name="afterDeploy">
+    	<!-- Empty default -->
+    </target>
+    
+    <target name="beforeDeploy">
+    	<!-- Empty default -->
+    </target>
+    
+	<target name="deploy">
+		<antcall target="beforeDeploy" />
+	 	<echo message="${server}: Deploying ${war} to ${deployDir}/${autodeployDir}" />
+		<copy file="${war}" todir="${deployDir}/${autodeployDir}"/>
+		<antcall target="afterDeploy" />
+	</target>
+
+	<target name="deployStatic">
+		<unzip src="${war}" dest="${staticDeployDir}">
+			<patternset>
+				<include name="VAADIN/**" />
+			</patternset>
+		</unzip>
+	</target>    
+    
+	 <target name="unpack-server">
+	 	<echo message="${server}: Unpacking ${server}.tar.gz" />
+	 	<delete dir="${server}" />
+		<exec executable="tar">
+		      <arg value="-xf"/>
+		      <arg value="${server}.tar.gz"/>
+		</exec>
+		<move file="${server}" tofile="${deployDir}" />
+		<echo message="Done." />
+	</target>
+	
+	<target name="doStartup">
+		<exec executable="./run.sh" spawn="${startupSpawn}">
+			<env key="JAVA_HOME" value="${JAVA_HOME}" />
+		</exec>
+	</target>
+	
+	<target name="startup">
+		<antcall target="doStartup" />
+		<echo message="${server}: Waiting for ${waitUrl} to become available." />
+		<waitfor maxwait="${waitMinutes}" maxwaitunit="minute" checkevery="10000" timeoutproperty="timeout">
+			 <http url="${waitUrl}" />
+		</waitfor>
+		<fail if="timeout" message="${server} failed to deploy" />
+
+		<echo message="${server}: Demo deployed successfully." />
+	</target>
+	
+	<target name="shutdown">
+		<exec executable="./stop.sh" >
+			<env key="JAVA_HOME" value="${JAVA_HOME}" />
+		</exec>
+		<sleep seconds="15" />
+	</target>
+	
+	<target name="check-port">
+		<fail message="${server}: Something is still listening on port ${serverPort}">
+			<condition>
+				<socket server="localhost" port="${serverPort}" />
+			</condition>
+		</fail>
+	</target>
+	
+	<target name="check-lock">
+	  <available file="${lock}" property="lockAvailable" />
+	  <fail unless="lockAvailable" message="Instance is not locked!" />
+  	</target>
+	 
+	 <target name="get-lock">
+	 	<mkdir dir="deploy" /> 
+	 	<exec executable="lockfile">
+	 		<arg value="${lock}" />
+	 	</exec>
+	 	<echo>${server}: Got the lock</echo>
+	 </target>
+	 
+	 <target name="clean">
+		<delete dir="${deployDir}" />
+	 </target>
+	 
+	 <target name="release-lock">
+<!--	 	<exec executable="rm">
+	 		<arg value="-f" />
+	 		<arg value="${lock}" />
+	 	</exec> -->
+	 	 <delete>
+		 	 <fileset dir="." includes="${lock}" />
+		 </delete>
+	 	<echo>${server}: Released the lock</echo>
+	 </target>
+	 
+	<target name="startup-and-deploy" depends="check-lock,check-port,unpack-server,deploy,startup" />
+	
+	<target name="shutdown-and-cleanup" depends="shutdown,clean,release-lock" />
+	 
+	 
+</project>
diff --git a/tests/integration_base_files/cleanup.sh b/tests/integration_base_files/cleanup.sh
new file mode 100644
index 0000000000..d2d5445070
--- /dev/null
+++ b/tests/integration_base_files/cleanup.sh
@@ -0,0 +1,21 @@
+echo checking and killing open servers
+    
+ps x | grep -E bin/java | grep -v grep | grep -v get-lock | awk '{print $1}' > temp
+     
+#Read and kill processes marked to temp
+while read line
+do
+  kill -9 $line
+done < temp
+      
+#Remove temp
+rm temp
+   
+if [ -a /home/integration/demo.war ]
+  then
+    echo removing old demo.war
+    rm /home/integration/demo.war
+fi
+     
+echo Cleaning deploy dir
+rm -rf /home/integration/deploy/*
diff --git a/tests/integration_base_files/lock_age.sh b/tests/integration_base_files/lock_age.sh
new file mode 100644
index 0000000000..1808ec05df
--- /dev/null
+++ b/tests/integration_base_files/lock_age.sh
@@ -0,0 +1,16 @@
+#! /bin/bash
+if [ -a /home/integration/deploy/lock.file ]
+ then
+  DATE=$(date +%s)
+  LOCK_AGE=$(stat -c %Z /home/integration/deploy/lock.file)
+
+  AGE=$[($DATE - $LOCK_AGE)/60]
+
+  if [ "$AGE" -gt "15" ]
+    then
+     echo lock.file is $AGE min old.
+     ./cleanup.sh
+#    else
+#     echo lock.file is $AGE min old.
+  fi
+fi
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 9217190499..9027686e7f 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -96,72 +96,84 @@
 	
 	<target name="integration-test-tomcat7">
 		<antcall target="run-generic-integration-test">
+			<param name="startDelay" value="300" />
 			<param name="target-server" value="tomcat7" />
 		</antcall>
 	</target>
 	
 	<target name="integration-test-tomcat4">
 		<antcall target="run-generic-integration-test">
+			<param name="startDelay" value="300" />
 			<param name="target-server" value="tomcat4" />
 		</antcall>
 	</target>
 	
 	<target name="integration-test-tomcat5">
 		<antcall target="run-generic-integration-test">
+			<param name="startDelay" value="300" />
 			<param name="target-server" value="tomcat5" />
 		</antcall>
 	</target>	
 	
 	<target name="integration-test-tomcat6">
 		<antcall target="run-generic-integration-test">
+			<param name="startDelay" value="300" />
 			<param name="target-server" value="tomcat6" />
 		</antcall>
 	</target>	
 	
 	<target name="integration-test-jetty5">
 		<antcall target="run-generic-integration-test">
+			<param name="startDelay" value="300" />
 			<param name="target-server" value="jetty5" />
 		</antcall>
 	</target>
 	
 	<target name="integration-test-jetty6">
 		<antcall target="run-generic-integration-test">
+			<param name="startDelay" value="300" />
 			<param name="target-server" value="jetty6" />
 		</antcall>
 	</target>
 	
 	<target name="integration-test-jetty7">
 		<antcall target="run-generic-integration-test">
+			<param name="startDelay" value="300" />
 			<param name="target-server" value="jetty7" />
 		</antcall>
 	</target>
 	
 	<target name="integration-test-jboss3">
 		<antcall target="run-generic-integration-test">
+			<param name="startDelay" value="300" />
 			<param name="target-server" value="jboss3" />
 		</antcall>
 	</target>
 	
 	<target name="integration-test-jboss4">
 		<antcall target="run-generic-integration-test">
+			<param name="startDelay" value="300" />
 			<param name="target-server" value="jboss4" />
 		</antcall>
 	</target>
 	
 	<target name="integration-test-jboss5">
 		<antcall target="run-generic-integration-test">
+			<param name="startDelay" value="300" />
 			<param name="target-server" value="jboss5" />
 		</antcall>
 	</target>
 		
 	<target name="integration-test-glassfish2">
 		<antcall target="run-generic-integration-test">
+			<param name="startDelay" value="300" />
 			<param name="target-server" value="glassfish2" />
 		</antcall>
 	</target>
 	
 	<target name="integration-test-glassfish3">
 		<antcall target="run-generic-integration-test">
+			<param name="startDelay" value="300" />
 			<param name="target-server" value="glassfish3" />
 		</antcall>
 	</target>
@@ -302,8 +314,28 @@
 		<property name="target-host" value="${target-server}.devnet.vaadin.com" />
 		<property name="target-port" value="8080" />
 		
-		<scp file="deploy-base.xml" todir="${user}@${target-host}:base.xml" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" />
-		<sshexec host="${target-host}" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml get-lock" />
+		<if>
+			<isset property="startDelay" />
+			<then>
+				<math result="sleepTime" datatype="int">
+					<op op="rint">
+						<op op="*">
+							<num value="${startDelay}"/>
+							<op op="random"/>
+						</op>
+					</op>
+				</math>
+				<echo>Delaying startup of ${target-server} with ${sleepTime} seconds</echo>		
+				<sleep seconds="${sleepTime}" />
+			</then>
+		</if>
+		
+		<scp todir="${user}@${target-host}:." keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" >
+			<fileset dir="integration_base_files">
+				<include name="*" />
+			</fileset>
+		</scp>
+		<sshexec host="${target-host}" username="${user}" keyfile="${sshkey.file}" trust="yes" command="chmod +x *.sh; ant -f deploy.xml get-lock" />
 		<scp file="${demo.war}" todir="${user}@${target-host}:demo.war" keyfile="${sshkey.file}" trust="yes" passphrase="${passphrase}" />
 		<sshexec host="${target-host}" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml startup-and-deploy" />
 		
-- 
cgit v1.2.3