diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 830a86d7cf125c2466b12c046be1ee5a5e492d0a..bee00beb7d19ac1e43470ca00406824640088f3e 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -77,12 +77,11 @@
${build.distribution}-${buildBranch}-${buildType}
-->
- <project name="patches-R1.5-P">
- <modificationset>
- <forceonly />
- </modificationset>
+ <project
+ name="patches-R1.5-P"
+ forceOnly="true">
- <schedule>
+ <schedule interval="${time.oneHour}">
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="cc_project_build.xml"
@@ -96,40 +95,28 @@
<property
name="buildType"
value="P" />
-
- <!-- need to make this build ID a better variable,
- especially for this 'patch' case
- <property
- name="buildId"
- value="B163391" />
- -->
<property
name="buildBranch"
value="R1.5" />
<property
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="R1_5_maintenance_patches" />
-
<property
name="build.distribution"
value="patches" />
-
</ant>
</schedule>
-
</project>
<project name="wtp-R1.5-M">
- <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+
<modificationset quietperiod="120">
<cvs
tag="R1_5_maintenance"
module="releng" />
-
</modificationset>
<schedule interval="${time.oneHour}">
@@ -164,19 +151,15 @@
<property
name="mapVersionTag"
value="R1_5_maintenance" />
-
</ant>
</schedule>
-
</project>
- <project name="retest-wtp-R1.5-M">
+ <project
+ name="retest-wtp-R1.5-M"
+ forceOnly="true">
- <modificationset>
- <forceonly />
- </modificationset>
-
- <schedule>
+ <schedule interval="${time.VeryVeryLongTime}">
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="cc_project_retest.xml"
@@ -193,29 +176,24 @@
<property
name="buildType"
value="M" />
-
<property
name="buildId"
value="1.5.5" />
<property
name="buildBranch"
value="R1.5" />
-
<property
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="R1_5_maintenance" />
-
</ant>
</schedule>
-
</project>
<project name="wtp-R2.0-M">
- <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+
<modificationset quietperiod="120">
<cvs
tag="R2_0_maintenance"
@@ -252,11 +230,9 @@
<property
name="buildBranch"
value="R2.0" />
-
<property
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="R2_0_maintenance" />
@@ -266,20 +242,15 @@
<property
name="releng-jsf-mapVersionTag"
value="R1_0_maintenance" />
-
-
</ant>
</schedule>
-
</project>
- <project name="retest-wtp-R2.0-M">
-
- <modificationset>
- <forceonly />
- </modificationset>
+ <project
+ name="retest-wtp-R2.0-M"
+ forceOnly="true">
- <schedule>
+ <schedule interval="${time.VeryVeryLongTime}">
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="cc_project_retest.xml"
@@ -300,11 +271,9 @@
<property
name="buildBranch"
value="R2.0" />
-
<property
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="R2_0_maintenance" />
@@ -314,20 +283,16 @@
<property
name="releng-jsf-mapVersionTag"
value="R1_0_maintenance" />
-
-
</ant>
</schedule>
-
</project>
<project name="wtp-R3.0-I">
- <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+
<modificationset quietperiod="120">
<cvs module="releng" />
<cvs module="releng-jsf" />
<cvs module="releng.dali" />
-
</modificationset>
<schedule interval="${time.oneHour}">
@@ -362,19 +327,15 @@
<property
name="build.distribution"
value="wtp" />
-
</ant>
</schedule>
-
</project>
- <project name="retest-wtp-R3.0-I">
+ <project
+ name="retest-wtp-R3.0-I"
+ forceOnly="true">
- <modificationset>
- <forceonly />
- </modificationset>
-
- <schedule>
+ <schedule interval="${time.VeryVeryLongTime}">
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="cc_project_retest.xml"
@@ -393,7 +354,6 @@
<property
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="HEAD" />
@@ -406,19 +366,14 @@
<property
name="build.distribution"
value="wtp" />
-
</ant>
</schedule>
-
</project>
-
- <project name="wtp-R3.0-N">
- <modificationset>
- <forceonly />
- </modificationset>
-
- <schedule>
+ <project
+ name="wtp-R3.0-N"
+ forceOnly="true">
+ <schedule interval="${time.oneHour}">
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="cc_project_build.xml"
@@ -450,19 +405,14 @@
<property
name="build.trial"
value="true" />
-
</ant>
</schedule>
-
</project>
- <project name="retest-wtp-R3.0-N">
-
- <modificationset>
- <forceonly />
- </modificationset>
-
- <schedule>
+ <project
+ name="retest-wtp-R3.0-N"
+ forceOnly="true">
+ <schedule interval="${time.VeryVeryLongTime}">
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="cc_project_retest.xml"
@@ -494,35 +444,22 @@
<property
name="build.trial"
value="true" />
-
</ant>
</schedule>
-
</project>
- <project name="wtp-R3.0-S">
+ <project
+ name="wtp-R3.0-S"
+ forceOnly="true">
+ <!-- change 'forceOnly' to false when in milestone phase -->
- <!-- comment out when ready to do release builds -->
- <modificationset>
- <forceonly />
+ <modificationset quietperiod="120">
+ <cvs module="releng" />
+ <cvs module="releng-jsf" />
+ <cvs module="releng.dali" />
</modificationset>
- <schedule>
- <!-- end of comment -->
-
-
- <!-- uncomment when ready to do release builds
- <modificationset quietperiod="120">
- <cvs module="releng" />
- <cvs module="releng-jsf" />
- <cvs module="releng.dali" />
-
- </modificationset>
-
- <schedule interval="${time.oneHour}">
- -->
-
-
+ <schedule interval="${time.oneHour}">
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="cc_project_build.xml"
@@ -544,7 +481,6 @@
<property
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="HEAD" />
@@ -560,19 +496,14 @@
<property
name="build.pack-all-in-one"
value="true" />
-
</ant>
</schedule>
-
</project>
- <project name="retest-wtp-R3.0-S">
-
- <modificationset>
- <forceonly />
- </modificationset>
-
- <schedule>
+ <project
+ name="retest-wtp-R3.0-S"
+ forceOnly="true">
+ <schedule interval="${time.VeryVeryLongTime}">
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="cc_project_retest.xml"
@@ -594,7 +525,6 @@
<property
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="HEAD" />
@@ -610,35 +540,22 @@
<property
name="build.pack-all-in-one"
value="true" />
-
</ant>
</schedule>
-
</project>
- <project name="wtp-R3.0-R">
+ <project
+ name="wtp-R3.0-R"
+ forceOnly="true">
+ <!-- change forceOnly to false when in release phase -->
- <!-- comment out when ready to do release builds -->
- <modificationset>
- <forceonly />
+ <modificationset quietperiod="120">
+ <cvs module="releng" />
+ <cvs module="releng-jsf" />
+ <cvs module="releng.dali" />
</modificationset>
- <schedule>
- <!-- end of comment -->
-
- <!-- uncomment when ready to do release builds
- <modificationset quietperiod="120">
- <cvs module="releng" />
- <cvs module="releng-jsf" />
- <cvs module="releng.dali" />
-
- </modificationset>
-
- <schedule interval="${time.oneHour}">
- -->
-
-
-
+ <schedule interval="${time.oneHour}">
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="cc_project_build.xml"
@@ -660,7 +577,6 @@
<property
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="HEAD" />
@@ -675,16 +591,13 @@
value="wtp" />
</ant>
</schedule>
-
</project>
- <project name="retest-wtp-R3.0-R">
+ <project
+ name="retest-wtp-R3.0-R"
+ forceOnly="true">
- <modificationset>
- <forceonly />
- </modificationset>
-
- <schedule>
+ <schedule interval="${time.VeryVeryLongTime}">
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="cc_project_retest.xml"
@@ -706,7 +619,6 @@
<property
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="HEAD" />
@@ -722,16 +634,11 @@
<property
name="build.pack-all-in-one"
value="true" />
-
</ant>
</schedule>
-
</project>
- <project name="wtp-buildTools-R3.0-T">
- <modificationset>
- <forceonly />
- </modificationset>
+ <project name="wtp-buildTools-R3.0-T" forceOnly="true">
<schedule>
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
@@ -748,11 +655,9 @@
<property
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="buildBranch"
value="R3.0" />
-
<property
name="mapVersionTag"
value="HEAD" />
@@ -765,10 +670,8 @@
<property
name="build.distribution"
value="wtp-buildTools" />
-
</ant>
</schedule>
-
</project>
</cruisecontrol>