diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml index 324a321ccd19c2743fb6a303b3095179b12a64b9..faf364da976b022731d04d11aa3f761571193b51 100644 --- a/releng.control/cc_config.xml +++ b/releng.control/cc_config.xml @@ -194,7 +194,7 @@ value="R2.0" /> <property name="build.distribution" - value="wtp" /> + value="wtp" /> <property name="mapVersionTag" value="R2_0_maintenance" /> @@ -254,7 +254,7 @@ </schedule> </project> --> - <project + <project name="incubator-R0.5-I"> <modificationset quietperiod="120"> @@ -394,7 +394,7 @@ <property name="skipCleanBuild" value="yes" /> - --> + --> </ant> </schedule> </project> @@ -474,7 +474,7 @@ </schedule> </project> <project - name="cleanup-artifacts-N"> + name="cleanup-artifacts-B"> <schedule interval="${time.oneHour}"> <exec @@ -482,6 +482,9 @@ command="${env.BUILD_HOME}/releng.control/cleanupArtifacts.sh"> </exec> </schedule> + <modificationset> + <!-- use empty modification set, to override our default "force only" version in standard plugin definition --> + </modificationset> <!-- need to prevent, or override, default publishers, especially since the ant default antpublisher will result in error, if an ant build hasn't ran --> diff --git a/releng.control/cleanupArtifacts.sh b/releng.control/cleanupArtifacts.sh index 107411f44e71282239d4cc54d339d9dfcbe3ad6e..463aee5bc33a24c761ee309264c7ade05ed28de7 100644 --- a/releng.control/cleanupArtifacts.sh +++ b/releng.control/cleanupArtifacts.sh @@ -20,7 +20,7 @@ fi # existence of more recent builds into account, so we never # delete the last existing build (even if "old"). -n=10; +ndays=5; artifactsDir=${PROJECT_ARTIFACTS}; echo; @@ -32,7 +32,7 @@ echo " number of directories before cleaning: ${before}"; # empty directories often result from "bad builds" find ${artifactsDir} -mindepth 2 -maxdepth 3 -type d -empty -exec rm -fr '{}' \; # now remove old ones -find ${artifactsDir} -mindepth 2 -maxdepth 2 -ctime +$n -exec rm -fr '{}' \; +find ${artifactsDir} -mindepth 2 -maxdepth 2 -ctime +$ndays -exec rm -fr '{}' \; after=`find ${artifactsDir} -mindepth 2 -maxdepth 2 | wc -l`; echo " number of directories after cleaning: ${after}";