[108259] Refactoring builds

archive/releng.builder/tools/cruise/committer.xml

@@ -10,7 +10,7 @@
 			<property name="mapVersionTag" value="${mapVersionTag}" />
 		</ant>
 
-		<ant antfile="/home/build-home/build-node/checkout/build-${build.distribution}-${buildType}/releng.wtpbuilder/distribution/wtp.build/build.xml" target="build">
+		<ant antfile="/home/build-home/build-node/checkout/${build.distribution}-${buildType}/releng.wtpbuilder/distribution/wtp.build/build.xml" target="build">
 			<property name="baseos" value="${baseos}" />
 			<property name="basews" value="${basews}" />
 			<property name="basearch" value="${basearch}" />
@@ -22,7 +22,7 @@
 			<property name="buildType" value="${buildType}" />
 			
 		</ant>
-		<ant antfile="/home/build-home/build-node/checkout/build-${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="site">
+		<ant antfile="/home/build-home/build-node/checkout/${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="site">
 			<property name="baseos" value="${baseos}" />
 			<property name="basews" value="${basews}" />
 			<property name="basearch" value="${basearch}" />
@@ -34,7 +34,7 @@
 			<property name="buildType" value="${buildType}" />
 			
 		</ant>
-		<ant antfile="/home/build-home/build-node/checkout/build-${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="upload">
+		<ant antfile="/home/build-home/build-node/checkout/${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="upload">
 			<property name="baseos" value="${baseos}" />
 			<property name="basews" value="${basews}" />
 			<property name="basearch" value="${basearch}" />
@@ -47,7 +47,7 @@
 			
 		</ant>
 
-		<ant antfile="/home/build-home/build-node/checkout/build-${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="test">
+		<ant antfile="/home/build-home/build-node/checkout/${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="test">
 			<property name="baseos" value="${baseos}" />
 			<property name="basews" value="${basews}" />
 			<property name="basearch" value="${basearch}" />
@@ -59,7 +59,7 @@
 			<property name="buildType" value="${buildType}" />
 		</ant>
 		
-		<ant antfile="/home/build-home/build-node/checkout/build-${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="site">
+		<ant antfile="/home/build-home/build-node/checkout/${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="site">
 			<property name="baseos" value="${baseos}" />
 			<property name="basews" value="${basews}" />
 			<property name="basearch" value="${basearch}" />
@@ -70,7 +70,7 @@
 			<property name="mapVersionTag" value="${mapVersionTag}" />
 			<property name="buildType" value="${buildType}" />
 		</ant>
-		<ant antfile="/home/build-home/build-node/checkout/build-${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="upload">
+		<ant antfile="/home/build-home/build-node/checkout/${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="upload">
 			<property name="baseos" value="${baseos}" />
 			<property name="basews" value="${basews}" />
 			<property name="basearch" value="${basearch}" />
@@ -87,6 +87,7 @@
 
 	<target name="clean" if="build.clean">
 		<delete dir="${build.home}/build-${build.distribution}-${buildType}" failonerror="false" />
+		<delete dir="${build.home}/test-${build.distribution}-${buildType}" failonerror="false" />
 	</target>