Test Fixes

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@72804 05bdf26c-840f-0410-9ced-eb539d925f36
asten-solutions · Feb 11, 2011 · 85073d2 · 85073d2
1 parent 50dbb00
commit 85073d2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/build-test-tomcat.xml b/build-test-tomcat.xml
@@ -27,11 +27,11 @@
 
 	<target name="prepare-cluster-tomcat-node">
 		<exec executable="${pscp.executable}">
-			<arg line="-pw ${vm.password} dist/liferay-portal-tomcat-${lp.version}.zip ${vm.username}@${cluster-node.host}:/" />
+			<arg line="-pw ${vm.password} dist/liferay-portal-tomcat-${lp.version}-${lp.version.tstamp}.zip ${vm.username}@${cluster-node.host}:/" />
 		</exec>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${cluster-node.host} cmd.exe /c C:\Progra~1\7-Zip\7z.exe x C:\liferay-portal-tomcat-${lp.version}.zip -oC:\" />
+			<arg line="-pw ${vm.password} ${vm.username}@${cluster-node.host} cmd.exe /c C:\Progra~1\7-Zip\7z.exe x C:\liferay-portal-tomcat-${lp.version}-${lp.version.tstamp}.zip -oC:\" />
 		</exec>
 
 		<antcall target="replace-remote-file">
@@ -78,11 +78,11 @@ web.server.display.node=true</echo>
 		<antcall target="prepare-zip-tomcat" />
 
 		<exec executable="${pscp.executable}">
-			<arg line="-pw ${vm.password} dist/liferay-portal-tomcat-${lp.version}.zip ${vm.username}@${vm.host}:/" />
+			<arg line="-pw ${vm.password} dist/liferay-portal-tomcat-${lp.version}-${lp.version.tstamp}.zip ${vm.username}@${vm.host}:/" />
 		</exec>
 
 		<exec executable="${plink.executable}">
-			<arg line="-pw ${vm.password} ${vm.username}@${vm.host} cmd.exe /c C:\Progra~1\7-Zip\7z.exe x C:\liferay-portal-tomcat-${lp.version}.zip -oC:\" />
+			<arg line="-pw ${vm.password} ${vm.username}@${vm.host} cmd.exe /c C:\Progra~1\7-Zip\7z.exe x C:\liferay-portal-tomcat-${lp.version}-${lp.version.tstamp}.zip -oC:\" />
 		</exec>
 
 		<antcall target="replace-remote-file">

diff --git a/build-test-weblogic-10.3.xml b/build-test-weblogic-10.3.xml
@@ -68,7 +68,7 @@
 				</waitfor>
 
 				<exec executable="${plink.executable}">
-					<arg line="-pw ${vm.password} ${vm.username}@${vm.host} C:\Oracle\Middleware\jdk160_14_R27.6.5-32\bin\java.exe -cp C:\Oracle\Middleware\wlserver_10.3\server\lib\weblogic.jar -Xmx256m weblogic.Deployer -adminurl t3://localhost:7001 -user system -password password1 -deploy -upload C:\liferay-portal-${lp.version}.war" />
+					<arg line="-pw ${vm.password} ${vm.username}@${vm.host} C:\Oracle\Middleware\jdk160_14_R27.6.5-32\bin\java.exe -cp C:\Oracle\Middleware\wlserver_10.3\server\lib\weblogic.jar -Xmx256m weblogic.Deployer -adminurl t3://localhost:7001 -user system -password password1 -deploy -upload C:\liferay-portal-${lp.version}-${lp.version.tstamp}.war" />
 				</exec>
 
 				<exec executable="${plink.executable}">

diff --git a/build-test-websphere-6.1.xml b/build-test-websphere-6.1.xml
@@ -67,7 +67,7 @@
 
 $AdminConfig save
 
-$AdminApp install "C:/liferay-portal-${lp.version}.war" {-appname liferay-portal -contextroot /}
+$AdminApp install "C:/liferay-portal-${lp.version}-${lp.version.tstamp}.war" {-appname liferay-portal -contextroot /}
 
 $AdminConfig save
 

diff --git a/build-test-websphere-7.0.xml b/build-test-websphere-7.0.xml
@@ -69,7 +69,7 @@ print AdminApp.uninstall('DefaultApplication')
 
 print AdminConfig.save()
 
-print AdminApp.install('C:/liferay-portal-${lp.version}.war', '[-appname liferay-portal -contextroot /]')
+print AdminApp.install('C:/liferay-portal-${lp.version}-${lp.version.tstamp}.war', '[-appname liferay-portal -contextroot /]')
 
 print AdminConfig.save()
 

diff --git a/build-test.xml b/build-test.xml
@@ -19,6 +19,10 @@
 	<property name="plink.executable" location="${project.dir}/tools/putty/plink.exe" />
 	<property name="pscp.executable" location="${project.dir}/tools/putty/pscp.exe" />
 
+	<tstamp>
+		<format property="lp.version.tstamp" pattern="yyyyMMdd" />
+	</tstamp>
+
 	<target name="append-ant-script">
 		<loadfile property="template.content" srcFile="portal-web/test-ant-templates/${ant.script.template}">
 			<filterchain>
@@ -1797,7 +1801,7 @@ resource.repositories.root=$${user.home}/liferay</echo>
 			</not>
 			<then>
 				<exec executable="${pscp.executable}">
-					<arg line="-pw ${vm.password} hosts dist\liferay-portal-${lp.version}.war tunnel-web\tunnel-web.war ${vm.username}@${vm.host}:/" />
+					<arg line="-pw ${vm.password} hosts dist\liferay-portal-${lp.version}-${lp.version.tstamp}.war tunnel-web\tunnel-web.war ${vm.username}@${vm.host}:/" />
 				</exec>
 
 				<delete file="hosts" />