From 1d70e16d74d81e28d87240e4d0f5f91975809459 Mon Sep 17 00:00:00 2001 From: david_williams <david_williams> Date: Sat, 22 Sep 2007 00:50:20 +0000 Subject: [PATCH] prep for final R201 builds --- releng.control/cc_config.xml | 211 ++--------------------------------- 1 file changed, 11 insertions(+), 200 deletions(-) diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml index f1b4fdff4..69c64631c 100644 --- a/releng.control/cc_config.xml +++ b/releng.control/cc_config.xml @@ -106,7 +106,7 @@ cvsroot="${env.CVS_MAIN_REPO}" /> <!-- - Note: projects should normally be named in the form + Note: projects should be named in the form ${build.distribution}-${buildBranch}-${buildType} --> @@ -136,6 +136,7 @@ </schedule> </project> +<!-- <project name="wtp-R1.5-M"> <modificationset quietperiod="120"> @@ -148,9 +149,9 @@ <schedule interval="${time.oneHour}"> <ant> - <!-- this "M" label should be changed to "R" once maintenance release + <!- - this "M" label should be changed to "R" once maintenance release is warming up for its "R"elease. - --> + - -> <property name="buildType" value="R" /> @@ -173,35 +174,7 @@ </schedule> </project> - <project - name="retest-wtp-R1.5-M" - forceOnly="true"> - - <schedule interval="${time.VeryVeryLongTime}"> - <ant - buildfile="${env.BUILD_HOME}/releng.control/cc_project_retest.xml"> - - <!-- this "M" label should be changed to "R" once maintenance release - is warming up for its "R"elease. - --> - <property - name="buildType" - value="R" /> - <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"> @@ -228,7 +201,7 @@ --> <property name="buildType" - value="M" /> + value="R" /> <property name="buildId" @@ -252,38 +225,7 @@ </schedule> </project> - <project - name="retest-wtp-R2.0-M" - forceOnly="true"> - - <schedule interval="${time.VeryVeryLongTime}"> - <ant - buildfile="${env.BUILD_HOME}/releng.control/cc_project_retest.xml"> - <property - name="buildType" - value="M" /> - - <property - name="buildId" - value="2.0.1" /> - <property - name="buildBranch" - value="R2.0" /> - <property - name="checkoutprojectname" - value="${project.name}" /> - <property - name="mapVersionTag" - value="R2_0_maintenance" /> - <property - name="releng.dali-mapVersionTag" - value="R1_0_maintenance" /> - <property - name="releng-jsf-mapVersionTag" - value="R1_0_maintenance" /> - </ant> - </schedule> - </project> + <project name="wtp-R3.0-I"> @@ -328,37 +270,7 @@ </schedule> </project> - <project - name="retest-wtp-R3.0-I" - forceOnly="true"> - - <schedule interval="${time.VeryVeryLongTime}"> - <ant - buildfile="${env.BUILD_HOME}/releng.control/cc_project_retest.xml"> - <property - name="buildType" - value="I" /> - <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" /> - </ant> - </schedule> - </project> + <project name="wtp-R3.0-N" @@ -391,37 +303,7 @@ </schedule> </project> - <project - name="retest-wtp-R3.0-N" - forceOnly="true"> - <schedule interval="${time.VeryVeryLongTime}"> - <ant - buildfile="${env.BUILD_HOME}/releng.control/cc_project_retest.xml"> - <property - name="buildType" - value="N" /> - <!-- in this context, buildBranch is simply a label --> - <property - name="buildBranch" - value="R3.0" /> - <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.trial" - value="true" /> - </ant> - </schedule> - </project> + <project name="wtp-R3.0-S" @@ -473,42 +355,7 @@ </schedule> </project> - <project - name="retest-wtp-R3.0-S" - forceOnly="true"> - <schedule interval="${time.VeryVeryLongTime}"> - <ant - buildfile="${env.BUILD_HOME}/releng.control/cc_project_retest.xml"> - <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 name="wtp-R3.0-R" @@ -557,43 +404,7 @@ </schedule> </project> - <project - name="retest-wtp-R3.0-R" - forceOnly="true"> - - <schedule interval="${time.VeryVeryLongTime}"> - <ant - buildfile="${env.BUILD_HOME}/releng.control/cc_project_retest.xml"> - <property - name="buildType" - value="R" /> - <property - name="buildId" - value="3.0" /> - <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 name="wtp-buildTools-R3.0-T" -- GitLab