285383 need a Helios build stream

releng.control/ant_low_priority_helios.sh

+#!/usr/bin/env bash
+#
+# remember to leave no slashes on commonVariations in source command,
+# so that users path is used to find it (first). But, path on
+# commonComputedVariables means we expect to execute only our
+# version
+
+if [ -z $BUILD_INITIALIZED ]
+then
+# if releng_control not set, we assume we are already in releng_control directory
+   if [ -z $RELENG_CONTROL ]
+   then
+        RELENG_CONROL=`pwd`
+   fi
+   pushd .
+   cd ${RELENG_CONTROL}
+   source commonVariations.shsource
+   source ${RELENG_CONTROL}/commonComputedVariables.shsource
+   popd
+fi
+
+export DEP_DIR=helios
+
+echo "Running ant at priority +3"
+exec nice --adjustment 10 "${RELENG_CONTROL}/ant.sh" "$@"

releng.control/cc_config.xml

@@ -899,4 +899,71 @@
             </ant>
         </schedule>
     </project>
+    <project
+        forceOnly="false"
+        requireModification="true"
+        name="wtp-R3.3-I">
+        <modificationset
+            quietperiod="120">
+            <cvs
+                module="${env.RELENGCOMMON}"
+                reallyquiet="${env.CVS_QUIET}"/>
+            <cvs
+                module="${env.RELENGEJBTOOLS}"
+                reallyquiet="${env.CVS_QUIET}"/>
+            <cvs
+                module="${env.RELENGJEETOOLS}"
+                reallyquiet="${env.CVS_QUIET}"/>
+            <cvs
+                module="${env.RELENGSERVERTOOLS}"
+                reallyquiet="${env.CVS_QUIET}"/>
+            <cvs
+                module="${env.RELENGSOURCEEDITING}"
+                reallyquiet="${env.CVS_QUIET}"/>
+            <cvs
+                module="${env.RELENGWEBSERVICES}"
+                reallyquiet="${env.CVS_QUIET}"/>
+            <cvs
+                module="${env.RELENGJSF}"
+                reallyquiet="${env.CVS_QUIET}"/>
+            <cvs
+                module="${env.RELENGDALI}"
+                reallyquiet="${env.CVS_QUIET}"/>
+        </modificationset>
+        <schedule
+            interval="${time.twentyFourHours}">
+            <ant
+                antscript="${env.RELENG_CONTROL}/ant_low_priority_helios.sh">
+                <property
+                    name="buildType"
+                    value="I"/>
+                <property
+                    name="buildId"
+                    value="3.2I"/>
+                <property
+                    name="buildBranch"
+                    value="R3.2"/>
+                <property
+                    name="mapVersionTag"
+                    value="HEAD"/>
+                <property
+                    name="releng.dali-mapVersionTag"
+                    value="HEAD"/>
+                <property
+                    name="releng.jsf-mapVersionTag"
+                    value="HEAD"/>
+                <property
+                    name="build.distribution"
+                    value="wtp"/>
+<!-- remember to remove these "skips" as we approach a test or declared build  -->
+                <property
+                    name="SKIP_JAR_SIGNING"
+                    value="true"/>
+                <property
+                    name="normalizeJarFiles"
+                    value="false"/>
+            </ant>
+        </schedule>
+    </project>
+    
 </cruisecontrol>
\ No newline at end of file

releng.wtpbuilder/distribution/wtp.build/build.xml

@@ -30,10 +30,14 @@
             name="buildTargets"
             value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
 
-        <!-- for this distribution, dependencies come from releng -->
+        <!-- for this distribution, dependencies come from releng. 
+             assume no subdirectory, if not otherwise set (bug 285383).
+        -->
+        <property name="env.DEP_DIR" value="" />
+        
         <property
             name="dependency.properties"
-            value="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties"/>
+            value="${buildDirectory}/maps/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
 
         <!-- calling label.xml to createg label.properties file -->
         <ant

releng.wtpbuilder/distribution/wtp.site/publish.xml

@@ -85,8 +85,14 @@
             testManifestFileName: name of xml file containing
             descriptions of zip types and log files
         -->
+       <!-- for this distribution, dependencies come from releng. 
+             assume no subdirectory, if not otherwise set (bug 285383).
+        -->
+        <property name="env.DEP_DIR" value="" />
+        
         <property
-            file="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties"/>
+            name="dependency.properties"
+            value="${buildDirectory}/maps/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
 
         <!-- create tables of test plugin compiles first -->
         <antcall

releng.wtpbuilder/distribution/wtp.tests/build.xml

@@ -93,9 +93,14 @@
         <ant
             antfile="${test.component.dir}/testdependency.xml"
             target="get">
-            <property
-                name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties"/>
+       <!-- for this distribution, dependencies come from releng. 
+             assume no subdirectory, if not otherwise set (bug 285383).
+        -->
+        <property name="env.DEP_DIR" value="" />
+        
+        <property
+            name="dependency.properties"
+            value="${buildDirectory}/maps/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
             <property
                 name="base.install.dir"
                 value="${testRoot}"/>

releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml

@@ -43,17 +43,27 @@
             dir="${testRoot}"/>
         <antcall
             target="getReleng"/>
+    	
+    	
+    	       <!-- for this distribution, dependencies come from releng. 
+    	             assume no subdirectory, if not otherwise set (bug 285383).
+    	        -->
+    	        <property name="env.DEP_DIR" value="" />
         <fail
-            message="Required file does not exist: ${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/dependencies.properties">
+            message="Required file does not exist: ${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties">
             <condition>
                 <not>
                     <available
-                        file="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/dependencies.properties"/>
+                        file="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
                 </not>
             </condition>
         </fail>
+
+        
         <property
-            file="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/dependencies.properties"/>
+            name="dependency.properties"
+            value="${buildDirectory}/maps/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
+            	
         <antcall
             target="getDependencies"/>
         <antcall