minor fix to improve order in-which projects are checked.
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 95ef742..c9903a6 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -40,20 +40,19 @@
useQuiet="${env.USE_QUIET}"
savelogdir="${env.LOG_DIR}/${project.name}"
antworkingdir="${env.ANT_WORKING}" />
- <plugin name="email"
- mailhost="localhost"
- returnaddress="${env.BUILD_BUILDMASTER_EMAIL}"
- returnname="${env.BUILD_BUILDMASTER_RETURN_NAME}"
- skipusers="${env.SKIPUSERS}"
- subjectprefix="[${env.BUILD_SUBJECT_PREFIX} ${project.name}]"
- spamwhilebroken="false"
- failasimportant="false"
- buildresultsurl="${env.BUILD_RESULT_URL}/${project.name}">
- <always
- address="${env.BUILD_ALWAYS_TO_ADDRESS}" />
- </plugin>
-
-
+ <plugin
+ name="email"
+ mailhost="localhost"
+ returnaddress="${env.BUILD_BUILDMASTER_EMAIL}"
+ returnname="${env.BUILD_BUILDMASTER_RETURN_NAME}"
+ skipusers="${env.SKIPUSERS}"
+ subjectprefix="[${env.BUILD_SUBJECT_PREFIX} ${project.name}]"
+ spamwhilebroken="false"
+ failasimportant="false"
+ buildresultsurl="${env.BUILD_RESULT_URL}/${project.name}">
+ <always
+ address="${env.BUILD_ALWAYS_TO_ADDRESS}" />
+ </plugin>
<plugin
name="project"
buildafterfailed="true">
@@ -86,11 +85,12 @@
name="localArtifactsDirectory"
value="${env.PROJECT_ARTIFACTS}/${project.name}" />
</antpublisher>
- <email>
+ <email>
<failure
address="${env.FAILED_ADDRESS}"
reportWhenFixed="true" />
- <propertiesmapper file="${env.EMAIL_PROPERTIES}" />
+ <propertiesmapper
+ file="${env.EMAIL_PROPERTIES}" />
</email>
</publishers>
</plugin>
@@ -103,8 +103,116 @@
Note: projects must be named in the form
${build.distribution}-${buildBranch}-${buildType}
+ Also, please note, the order is somewhat important, too.
+ We order these so the quickest running come first in the list,
+ so they have an opportunity to "get done" before a longer one starts.
+ The next criteria is importance
+
-->
<project
+ name="cleanup-artifacts-B">
+ <schedule
+ interval="${time.oneHour}">
+ <exec
+ workingdir="${env.BUILD_HOME}/releng.control"
+ command="${env.BUILD_HOME}/releng.control/cleanupArtifacts.sh">
+ </exec>
+ </schedule>
+ <!-- need to prevent, or override, default publishers,
+ especially since the ant default antpublisher will
+ result in error, if an ant build hasn't ran! -->
+ <publishers>
+ </publishers>
+ </project>
+ <project
+ name="wtpbuildTools-R3.0-T"
+ forceOnly="true">
+ <schedule
+ interval="${time.veryLongTime}">
+ <ant>
+ <property
+ name="buildType"
+ value="T" />
+ <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="wtpbuildTools" />
+ </ant>
+ </schedule>
+ </project>
+ <project
+ name="incubator-R0.5-S">
+ <modificationset
+ quietperiod="120">
+ <cvs
+ module="${env.RELENG}"
+ reallyquiet="${env.CVS_REALLY_QUIET}" />
+ <cvs
+ module="${env.RELENGINCUBATOR}"
+ reallyquiet="${env.CVS_REALLY_QUIET}" />
+ </modificationset>
+ <schedule
+ interval="${time.oneHour}">
+ <ant>
+ <property
+ name="buildType"
+ value="S" />
+ <property
+ name="buildId"
+ value="0.5M5" />
+ <property
+ name="buildBranch"
+ value="R0.5" />
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="incubator" />
+ </ant>
+ </schedule>
+ </project>
+ <project
+ name="incubator-R0.5-I">
+ <modificationset
+ quietperiod="120">
+ <cvs
+ module="${env.RELENG}"
+ reallyquiet="${env.CVS_REALLY_QUIET}" />
+ <cvs
+ module="${env.RELENGINCUBATOR}"
+ reallyquiet="${env.CVS_REALLY_QUIET}" />
+ </modificationset>
+ <schedule
+ interval="${time.veryLongTime}">
+ <ant>
+ <property
+ name="buildType"
+ value="I" />
+ <property
+ name="buildBranch"
+ value="R0.5" />
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="incubator" />
+ </ant>
+ </schedule>
+ </project>
+ <project
name="patches-R1.5-P"
forceOnly="true">
<schedule
@@ -126,7 +234,7 @@
</schedule>
<!-- no user notification for patch builds. -->
<publishers>
- <antpublisher
+ <antpublisher
antscript="${env.RELENG_CONTROL}/ant.sh"
buildfile="${env.RELENG_CONTROL}/cc_copyArtifacts.xml"
target="copyArtifacts"
@@ -136,27 +244,15 @@
name="localArtifactsDirectory"
value="${env.PROJECT_ARTIFACTS}/${project.name}" />
</antpublisher>
- <email>
+ <email>
<failure
address="${env.FAILED_ADDRESS}"
reportWhenFixed="true" />
- <propertiesmapper file="" />
+ <propertiesmapper
+ file="" />
</email>
</publishers>
</project>
-
- <!-- skipCleanBuild causes the most recent build
- to be re-used to do the Unit Tests
- <property
- name="skipCleanBuild"
- value="yes" />
- -->
-
- <!--
- <property
- name="skipUnitTests"
- value="yes" />
- -->
<project
name="wtp-R2.0-M">
<modificationset
@@ -200,72 +296,29 @@
value="R1_0_maintenance" />
<property
name="SKIP_JAR_SIGNING"
- value="true"/>
+ value="true" />
</ant>
</schedule>
</project>
- <project
- name="incubator-R0.5-I">
- <modificationset
- quietperiod="120">
- <cvs
- module="${env.RELENG}"
- reallyquiet="${env.CVS_REALLY_QUIET}" />
- <cvs
- module="${env.RELENGINCUBATOR}"
- 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.veryLongTime}">
+ <schedule interval="${time.oneHour}">
<ant>
- <property
- name="buildType"
- value="I" />
- <property
- name="buildBranch"
- value="R0.5" />
- <property
- name="mapVersionTag"
- value="HEAD" />
- <property
- name="build.distribution"
- value="incubator" />
+ <property name="buildType" value="S" />
+ <property name="buildId" value="3.0M5" />
+ <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" />
</ant>
</schedule>
- </project>
- <project
- name="incubator-R0.5-S">
- <modificationset
- quietperiod="120">
- <cvs
- module="${env.RELENG}"
- reallyquiet="${env.CVS_REALLY_QUIET}" />
- <cvs
- module="${env.RELENGINCUBATOR}"
- reallyquiet="${env.CVS_REALLY_QUIET}" />
- </modificationset>
- <schedule
- interval="${time.oneHour}">
- <ant>
- <property
- name="buildType"
- value="S" />
- <property
- name="buildId"
- value="0.5M5" />
- <property
- name="buildBranch"
- value="R0.5" />
- <property
- name="mapVersionTag"
- value="HEAD" />
- <property
- name="build.distribution"
- value="incubator" />
- </ant>
- </schedule>
- </project>
- <project
+ </project><project
name="wtp-R3.0-I">
<modificationset
quietperiod="120">
@@ -337,87 +390,7 @@
</ant>
</schedule>
</project>
- <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.0M5" />
- <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" />
- </ant>
- </schedule>
- </project>
- <project
- name="wtpbuildTools-R3.0-T"
- forceOnly="true">
- <schedule
- interval="${time.veryLongTime}">
- <ant>
- <property
- name="buildType"
- value="T" />
- <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="wtpbuildTools" />
- </ant>
- </schedule>
- </project>
- <project
- name="cleanup-artifacts-B">
- <schedule
- interval="${time.oneHour}">
- <exec
- workingdir="${env.BUILD_HOME}/releng.control"
- command="${env.BUILD_HOME}/releng.control/cleanupArtifacts.sh">
- </exec>
- </schedule>
- <!-- need to prevent, or override, default publishers,
- especially since the ant default antpublisher will
- result in error, if an ant build hasn't ran! -->
- <publishers>
- </publishers>
- </project>
+
+
+
</cruisecontrol>
\ No newline at end of file