LPS-57298 CI work around, revert this until Kiyoshi fix the CI machin…

…es' PATH env variable to include DB2's bin folder.
xieh · Jul 22, 2015 · 6710e73 · 6710e73
1 parent 6a6bc23
commit 6710e73
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 13 deletions.
diff --git a/build-test-batch.xml b/build-test-batch.xml
@@ -53,9 +53,19 @@
 		<sequential>
 			<database-test-action database.type="@{database.type}">
 				<action>
-					<exec executable="${database.service.executable}" failonerror="true">
-						<arg line="${database.service.cmd.stop}" />
-					</exec>
+					<if>
+						<equals arg1="@{database.type}" arg2="db2" />
+						<then>
+							<exec dir="/opt/ibm/db2/V10.5/bin" executable="${database.service.executable}" failonerror="true">
+								<arg line="${database.service.cmd.stop}" />
+							</exec>
+						</then>
+						<else>
+							<exec executable="${database.service.executable}" failonerror="true">
+								<arg line="${database.service.cmd.stop}" />
+							</exec>
+						</else>
+					</if>
 				</action>
 			</database-test-action>
 
@@ -67,9 +77,19 @@
 
 					<set-portal-impl-system-ext-properties />
 
-					<exec executable="${database.service.executable}" failonerror="true">
-						<arg line="${database.service.cmd.start}" />
-					</exec>
+					<if>
+						<equals arg1="@{database.type}" arg2="db2" />
+						<then>
+							<exec dir="/opt/ibm/db2/V10.5/bin" executable="${database.service.executable}" failonerror="true">
+								<arg line="${database.service.cmd.start}" />
+							</exec>
+						</then>
+						<else>
+							<exec executable="${database.service.executable}" failonerror="true">
+								<arg line="${database.service.cmd.start}" />
+							</exec>
+						</else>
+					</if>
 
 					<antcall target="copy-optional-jars" inheritall="false" >
 						<param name="database.type" value="@{database.type}" />
@@ -87,9 +107,19 @@
 
 					<test-action />
 
-					<exec executable="${database.service.executable}" failonerror="true">
-						<arg line="${database.service.cmd.stop}" />
-					</exec>
+					<if>
+						<equals arg1="@{database.type}" arg2="db2" />
+						<then>
+							<exec dir="/opt/ibm/db2/V10.5/bin" executable="${database.service.executable}" failonerror="true">
+								<arg line="${database.service.cmd.stop}" />
+							</exec>
+						</then>
+						<else>
+							<exec executable="${database.service.executable}" failonerror="true">
+								<arg line="${database.service.cmd.stop}" />
+							</exec>
+						</else>
+					</if>
 				</action>
 			</database-test-action>
 		</sequential>

diff --git a/build-test.xml b/build-test.xml
@@ -5328,12 +5328,12 @@ cluster.link.bind.addr["cluster-link-udp"]=127.0.0.1</echo>
 				<if>
 					<equals arg1="${database.type}" arg2="db2" />
 					<then>
-						<exec executable="${db2.executable}">
-							<arg value="-fdrop.sql" />
+						<exec dir="/opt/ibm/db2/V10.5/bin" executable="${db2.executable}">
+							<arg value="-f${project.dir}/drop.sql" />
 							<arg value="-t" />
 						</exec>
-						<exec executable="${db2.executable}" failonerror="true">
-							<arg value="-fcreate.sql" />
+						<exec dir="/opt/ibm/db2/V10.5/bin" executable="${db2.executable}" failonerror="true">
+							<arg value="-f${project.dir}/create.sql" />
 							<arg value="-t" />
 						</exec>
 					</then>