moving to S builds
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index d4cf81e..ec79d5f 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -16,32 +16,25 @@
<property
name="logDir"
value="${env.LOG_DIR}/${project.name}" />
-
<property
name="time.tenMinutes"
value="600" />
-
<property
name="time.oneHour"
value="3600" />
-
<property
name="time.twentyFourHours"
value="86400" />
-
<property
name="time.VeryVeryLongTime"
value="31536000" />
-
<plugin
name="log"
dir="${logDir}"
encoding="ISO-8859-1" />
-
<plugin
name="currentbuildstatuslistener"
file="${logDir}/status.txt" />
-
<plugin
name="ant"
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
@@ -52,11 +45,11 @@
savelogdir="${logDir}"
usedebug="${env.USE_DEBUG}"
antworkingdir="${env.BUILD_HOME}/releng.control" />
-
<plugin
name="project"
buildafterfailed="true">
- <dateformat format="yyyy-MM-dd HH:mm '('z')'" />
+ <dateformat
+ format="yyyy-MM-dd HH:mm '('z')'" />
<log
dir="${logDir}"
encoding="ISO-8859-1">
@@ -76,7 +69,6 @@
<modificationset>
<forceonly />
</modificationset>
-
<publishers>
<antpublisher
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
@@ -99,12 +91,11 @@
subjectprefix="[${project.name}]"
spamwhilebroken="false"
buildresultsurl="${env.BUILD_RESULT_URL}/${project.name}">
- <always address="${env.BUILD_ALWAYS_TO_ADDRESS}" />
+ <always
+ address="${env.BUILD_ALWAYS_TO_ADDRESS}" />
</email>
-
</publishers>
</plugin>
-
<plugin
name="cvs"
cvsroot=":${env.WTP_CVS_PROTOCOL}:${env.WTP_CVS_USER}@${env.WTP_CVS_SERVER}:${env.WTP_CVS_ROOT}" />
@@ -114,15 +105,12 @@
Note: projects should be named in the form
${build.distribution}-${buildBranch}-${buildType}
-->
-
-
<project
name="patches-R1.5-P"
forceOnly="true">
-
- <schedule interval="${time.oneHour}">
+ <schedule
+ interval="${time.oneHour}">
<ant>
-
<property
name="buildType"
value="P" />
@@ -138,8 +126,6 @@
<property
name="build.distribution"
value="patches" />
-
-
</ant>
</schedule>
</project>
@@ -191,10 +177,10 @@
</project>
-->
-
- <project name="wtp-R2.0-M">
-
- <modificationset quietperiod="120">
+ <project
+ name="wtp-R2.0-M">
+ <modificationset
+ quietperiod="120">
<cvs
tag="R2_0_maintenance"
module="${env.RELENGMAPS}"
@@ -208,14 +194,12 @@
module="${env.RELENGJSF}"
reallyQuiet="${env.CVS_REALLY_QUIET}" />
</modificationset>
-
- <schedule interval="${time.oneHour}">
+ <schedule
+ interval="${time.oneHour}">
<ant>
-
<property
name="buildType"
value="M" />
-
<property
name="buildId"
value="2.0.2" />
@@ -287,9 +271,10 @@
</schedule>
</project>
-->
- <project name="wtp-R3.0-I">
-
- <modificationset quietperiod="120">
+ <project
+ name="wtp-R3.0-I">
+ <modificationset
+ quietperiod="120">
<cvs
module="${env.RELENGMAPS}"
reallyQuiet="${env.CVS_REALLY_QUIET}" />
@@ -300,10 +285,9 @@
module="${env.RELENGDALI}"
reallyQuiet="${env.CVS_REALLY_QUIET}" />
</modificationset>
-
- <schedule interval="${time.oneHour}">
+ <schedule
+ interval="${time.VeryVeryLongTime}">
<ant>
-
<property
name="buildType"
value="I" />
@@ -313,7 +297,6 @@
<property
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="HEAD" />
@@ -329,13 +312,11 @@
</ant>
</schedule>
</project>
-
-
-
<project
name="wtp-R3.0-N"
forceOnly="true">
- <schedule interval="${time.VeryVeryLongTime}">
+ <schedule
+ interval="${time.VeryVeryLongTime}">
<ant>
<property
name="buildType"
@@ -365,56 +346,54 @@
<!-- remove 'forceOnly' once we move into this phase of building -->
- <!--
- <project
- name="wtp-R3.0-S"
- forceOnly="true">
-
- <modificationset quietperiod="120">
- <cvs
- module="${env.RELENGMAPS}"
- reallyQuiet="${env.CVS_REALLY_QUIET}" />
- <cvs
- module="${env.RELENGJSF}"
- reallyQuiet="${env.CVS_REALLY_QUIET}" />
- <cvs
- module="${env.RELENGDALI}"
- reallyQuiet="${env.CVS_REALLY_QUIET}" />
+ <project
+ name="wtp-R3.0-S">
+ <modificationset
+ quietperiod="120">
+ <cvs
+ module="${env.RELENGMAPS}"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
+ <cvs
+ module="${env.RELENGJSF}"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
+ <cvs
+ module="${env.RELENGDALI}"
+ reallyQuiet="${env.CVS_REALLY_QUIET}" />
</modificationset>
-
- <schedule interval="${time.oneHour}">
- <ant>
- <property
- name="buildType"
- value="S" />
- <property
- name="buildId"
- value="3.0M1" />
- <property
- name="buildBranch"
- value="R3.0" />
- <property
- name="checkoutprojectname"
- value="${project.name}" />
- <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" />
- <property
- name="build.pack-all-in-one"
- value="true" />
- </ant>
+ <schedule
+ interval="${time.oneHour}">
+ <ant>
+ <property
+ name="buildType"
+ value="S" />
+ <property
+ name="buildId"
+ value="3.0M1" />
+ <property
+ name="buildBranch"
+ value="R3.0" />
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+ <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" />
+ <property
+ name="build.pack-all-in-one"
+ value="true" />
+ </ant>
</schedule>
- </project>
- -->
+ </project>
+
<!-- remove 'forceOnly' once we move into this phase of building -->
<!--
@@ -465,11 +444,11 @@
</project>
-->
-
<project
name="wtp-buildTools-R3.0-T"
forceOnly="true">
- <schedule interval="${time.VeryVeryLongTime}">
+ <schedule
+ interval="${time.VeryVeryLongTime}">
<ant>
<property
name="buildType"
@@ -495,9 +474,10 @@
</ant>
</schedule>
</project>
-
- <project name="cleanup artifacts">
- <schedule interval="${time.twentyFourHours}">
+ <project
+ name="cleanup artifacts">
+ <schedule
+ interval="${time.twentyFourHours}">
<exec
workingdir="${env.BUILD_HOME}/releng.control"
command="${env.BUILD_HOME}/releng.control/cleanupArtifacts.sh">
@@ -509,7 +489,4 @@
<publishers>
</publishers>
</project>
-
-
-</cruisecontrol>
-
+</cruisecontrol>
\ No newline at end of file