From 6fddad0f777f6abc11d920708d99d418f7d7350a Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Tue, 4 Nov 2008 05:55:41 +0000
Subject: [PATCH] prep for S builds
---
releng.control/cc_config.xml | 317 +++++++----------------------------
1 file changed, 63 insertions(+), 254 deletions(-)
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 5caeefd8f..404e9103c 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -325,213 +325,6 @@
</publishers>
</project>
- <!--
- <project
- name="wtp-R2.0-M">
- <modificationset
- quietperiod="120">
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENGCOMMON}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENGEJBTOOLS}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENGJEETOOLS}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENGSERVERTOOLS}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENGSOURCEEDITING}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENGWEBSERVICES}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENG}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R1_0_maintenance"
- module="${env.RELENGDALI}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R1_0_maintenance"
- module="${env.RELENGJSF}"
- reallyquiet="${env.CVS_QUIET}" />
- </modificationset>
- <schedule
- interval="${time.oneHour}">
- <ant>
- <property
- name="buildType"
- value="M" />
- <property
- name="buildId"
- value="2.0.3" />
- <property
- name="buildBranch"
- value="R2.0" />
- <property
- name="build.distribution"
- value="wtp" />
- <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" />
- <property
- name="SKIP_JAR_SIGNING"
- value="true" />
- </ant>
- </schedule>
- </project>
- -->
- <!--
- <project
- name="wtp-R2.0-R">
- <modificationset
- quietperiod="120">
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENGCOMMON}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENGEJBTOOLS}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENGJEETOOLS}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENGSERVERTOOLS}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENGSOURCEEDITING}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENGWEBSERVICES}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R2_0_maintenance"
- module="${env.RELENG}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R1_0_maintenance"
- module="${env.RELENGDALI}"
- reallyquiet="${env.CVS_QUIET}" />
- <cvs
- tag="R1_0_maintenance"
- module="${env.RELENGJSF}"
- reallyquiet="${env.CVS_QUIET}" />
- </modificationset>
- <schedule
- interval="${time.oneHour}">
- <ant>
- <property
- name="buildType"
- value="R" />
- <property
- name="buildId"
- value="2.0.3" />
- <property
- name="buildBranch"
- value="R2.0" />
- <property
- name="build.distribution"
- value="wtp" />
- <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" />
- <property
- name="SKIP_JAR_SIGNING"
- value="true" />
- </ant>
- </schedule>
- </project>
- -->
- <!--
- <project
- requireModification="false"
- name="patches-R2.0.2-P"
- forceOnly="true">
- <modificationset>
- <!- - http://jira.public.thoughtworks.org/browse/CC-766 - ->
- <forceonly />
- </modificationset>
- <schedule
- interval="${time.veryLongTime}">
- <ant>
- <property
- name="buildType"
- value="P" />
- <property
- name="buildBranch"
- value="R2.0.2" />
- <property
- name="build.distribution"
- value="patches2" />
- <property
- name="mapVersionTag"
- value="R2_0_2_patches" />
- <property
- name="releng.dali-mapVersionTag"
- value="R1_0_2_patches" />
- <property
- name="releng.jsf-mapVersionTag"
- value="R1_0_2_patches" />
- <property
- name="SKIP_JAR_SIGNING"
- value="true" />
- </ant>
- </schedule>
- <publishers>
- <antpublisher
- antscript="${env.RELENG_CONTROL}/ant_med_priority.sh"
- buildfile="${env.RELENG_CONTROL}/cc_copyArtifacts.xml"
- target="copyArtifacts"
- usequiet="true"
- uselogger="false"
- antWorkingDir="${env.BUILD_HOME}/tmp"
- saveLogDir="${env.BUILD_HOME}/tmp">
- <property
- name="localArtifactsDirectory"
- value="${env.PROJECT_ARTIFACTS}/${project.name}" />
- </antpublisher>
- <htmlemail
- skipusers="true"
- logdir="${env.BUILD_HOME}/tmp">
- <failure
- address="${env.FAILED_ADDRESS}"
- reportWhenFixed="true" />
- <propertiesmapper
- file="" />
- </htmlemail>
- </publishers>
- </project>
- -->
-
<!--
<project
name="wtp-R3.1-R">
@@ -593,7 +386,7 @@
</schedule>
</project>
-->
- <!--
+
<project
name="wtp-R3.1-S">
<modificationset
@@ -634,7 +427,7 @@
value="S"/>
<property
name="buildId"
- value="3.1M2"/>
+ value="3.1M3"/>
<property
name="buildBranch"
value="R3.1"/>
@@ -653,7 +446,7 @@
</ant>
</schedule>
</project>
- -->
+
<project
name="wtp-R3.1-I">
@@ -688,7 +481,7 @@
reallyquiet="${env.CVS_QUIET}"/>
</modificationset>
<schedule
- interval="${time.twoHours}">
+ interval="${time.oneHour}">
<ant antscript="${env.RELENG_CONTROL}/ant_low_priority.sh">
<property
name="buildType"
@@ -724,65 +517,84 @@
</schedule>
</project>
-
+
<project
- requireModification="false"
- name="patches-R3.0.1-P"
- forceOnly="true">
- <modificationset>
- <!-- http://jira.public.thoughtworks.org/browse/CC-766 -->
- <forceonly />
+ name="wtp-R3.0-M">
+ <modificationset
+ quietperiod="120">
+ <cvs
+ tag="R3_0_maintenance"
+ module="${env.RELENG}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R3_0_maintenance"
+ module="${env.RELENGCOMMON}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R3_0_maintenance"
+ module="${env.RELENGEJBTOOLS}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R3_0_maintenance"
+ module="${env.RELENGJEETOOLS}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R3_0_maintenance"
+ module="${env.RELENGSERVERTOOLS}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R3_0_maintenance"
+ module="${env.RELENGSOURCEEDITING}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R3_0_maintenance"
+ module="${env.RELENGWEBSERVICES}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R3_0_maintenance"
+ module="${env.RELENGJSF}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ tag="R2_0_maintenance"
+ module="${env.RELENGDALI}"
+ reallyquiet="${env.CVS_QUIET}"/>
</modificationset>
<schedule
- interval="${time.veryLongTime}">
+ interval="${time.oneHour}">
<ant>
<property
name="buildType"
- value="P" />
+ value="M"/>
<property
name="buildBranch"
- value="R3.0.1" />
+ value="R3.0"/>
+ <property
+ name="buildId"
+ value="3.0.3"/>
<property
name="mapVersionTag"
- value="R3_0_1_patches" />
+ value="R3_0_maintenance"/>
<property
name="releng.dali-mapVersionTag"
- value="R2_0_1_patches"/>
+ value="R2_0_maintenance"/>
<property
name="releng.jsf-mapVersionTag"
- value="R3_0_1_patches"/>
+ value="R3_0_maintenance"/>
<property
name="build.distribution"
- value="patches3" />
+ value="wtp"/>
+ <property
+ name="SKIP_JAR_SIGNING"
+ value="true" />
+ <property
+ name="normalizeJarFiles"
+ value="false" />
</ant>
</schedule>
- <publishers>
- <antpublisher
- antscript="${env.RELENG_CONTROL}/ant_med_priority.sh"
- buildfile="${env.RELENG_CONTROL}/cc_copyArtifacts.xml"
- target="copyArtifacts"
- usequiet="true"
- uselogger="false"
- antWorkingDir="${env.BUILD_HOME}/tmp"
- saveLogDir="${env.BUILD_HOME}/tmp">
- <property
- name="localArtifactsDirectory"
- value="${env.PROJECT_ARTIFACTS}/${project.name}" />
- </antpublisher>
- <htmlemail
- skipusers="true"
- logdir="${env.BUILD_HOME}/tmp">
- <failure
- address="${env.FAILED_ADDRESS}"
- reportWhenFixed="true" />
- <propertiesmapper
- file="" />
- </htmlemail>
- </publishers>
</project>
-
+
<project
- name="wtp-R3.0-M">
+ name="wtp-R3.0-R">
<modificationset
quietperiod="120">
<cvs
@@ -827,7 +639,7 @@
<ant>
<property
name="buildType"
- value="M"/>
+ value="R"/>
<property
name="buildBranch"
value="R3.0"/>
@@ -846,9 +658,6 @@
<property
name="build.distribution"
value="wtp"/>
- <property
- name="SKIP_JAR_SIGNING"
- value="true" />
</ant>
</schedule>
</project>
--
GitLab