LPS-52162 SF

vladkon777 · Dec 16, 2014 · 3378786 · 3378786
1 parent 87fde70
commit 3378786
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/build-test-plugins.xml b/build-test-plugins.xml
@@ -4,13 +4,11 @@
 	<import file="build-test.xml" />
 
 	<target name="deploy-extra-apps">
-		<fail message="Please set the property ${jenkins.shared.user.content.dir}" unless="jenkins.shared.user.content.dir" />
-		<fail message="Please set the property ${top.level.build.number}" unless="top.level.build.number" />
-		<fail message="Please set the property ${top.level.job.name}" unless="top.level.job.name" />
+		<fail message="Please set the property ${extra.apps.zip.file.name}" unless="extra.apps.zip.file.name" />
 
 		<unzip
 			dest="${liferay.home}/deploy"
-			src="${jenkins.shared.user.content.dir}/jobs/${top.level.job.name}/builds/${top.level.build.number}/downloads/extraapps.zip"
+			src="${extra.apps.zip.file.name}"
 		/>
 	</target>
 

diff --git a/build-test.xml b/build-test.xml
@@ -1319,6 +1319,19 @@ ${marketplace.portlet.properties}</echo>
 		</if>
 	</target>
 
+	<target name="deploy-extra-apps">
+		<var name="extra.apps.zip.file.name" value="${jenkins.shared.user.content.dir}/jobs/${top.level.job.name}/builds/${top.level.build.number}/downloads/extraapps.zip" />
+
+		<if>
+			<available file="${extra.apps.zip.file.name}" />
+			<then>
+				<ant antfile="build-test-plugins.xml" target="deploy-extra-apps">
+					<property name="extra.apps.zip.file.name" value="${extra.apps.zip.file.name}" />
+				</ant>
+			</then>
+		</if>
+	</target>
+
 	<target name="deploy-specified-plugins">
 
 		<!--
@@ -4019,6 +4032,8 @@ if (ppstate.equals("normal")) {
 			</then>
 		</if>
 
+		<antcall target="deploy-extra-apps" />
+
 		<antcall target="deploy-required-plugins" />
 
 		<antcall target="deploy-specified-plugins" />