From 21902525dcee2a72d218fe38e9855a4a71ddc8d0 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Wed, 30 Jan 2008 07:27:35 +0000
Subject: [PATCH] attempt to fix mail notification
---
releng.control/cc_config.xml | 69 ++++--------------------
releng.control/commonVariations.shsource | 5 ++
2 files changed, 16 insertions(+), 58 deletions(-)
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index abe9e5d17..27a2f9ae0 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -90,63 +90,7 @@
<failure
address="${env.FAILED_ADDRESS}"
reportWhenFixed="true" />
- <map
- alias="david_williams"
- address="david_williams@mindspring.com" />
- <map
- alias="amywu"
- address="wuamy@ca.ibm.com" />
- <map
- alias="cbridgha"
- address="cbridgha@us.ibm.com" />
- <map
- alias="deboer"
- address="deboer@ca.ibm.com" />
- <map
- alias="kchan"
- address="kathy@ca.ibm.com" />
- <map
- alias="kchong"
- address="kchong@ca.ibm.com" />
- <map
- alias="nitind"
- address="nitind@us.ibm.com" />
- <map
- alias="rfrost"
- address="rfrost@bea.com" />
- <map
- alias="rsrinivasan"
- address="raghunathan.srinivasan@oracle.com" />
- <map
- alias="cbateman"
- address="cameron.bateman@oracle.com" />
- <map
- alias="kkomissarchik"
- address="kosta@bea.com" />
- <map
- alias="ndai"
- address="ndai@eteration.com" />
- <map
- alias="tle"
- address="tran.le@oracle.com" />
- <map
- alias="nhauge"
- address="neil.hauge@oracle.com" />
- <map
- alias="kraev"
- address="kaloyan.raev@sap.com" />
- <map
- alias="pberkland"
- address="berkland@us.ibm.com" />
- <map
- alias="bchilds"
- address="childsb@us.ibm.com" />
- <map
- alias="canderson"
- address="ccc@us.ibm.com" />
- <map
- alias="lisaacs"
- address="Larry.Isaacs@sas.com" />
+ <propertiesmapper file="${env.EMAIL_PROPERTIES}" />
</email>
</publishers>
</plugin>
@@ -179,6 +123,15 @@
value="patches" />
</ant>
</schedule>
+ <!-- no user notification for patch builds. -->
+ <publishers>
+ <email>
+ <failure
+ address="${env.FAILED_ADDRESS}"
+ reportWhenFixed="true" />
+ <propertiesmapper file="" />
+ </email>
+ </publishers>
</project>
<!-- skipCleanBuild causes the most recent build
@@ -440,7 +393,7 @@
</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 -->
+ result in error, if an ant build hasn't ran! -->
<publishers>
</publishers>
</project>
diff --git a/releng.control/commonVariations.shsource b/releng.control/commonVariations.shsource
index 61c78a502..9c45e88e8 100644
--- a/releng.control/commonVariations.shsource
+++ b/releng.control/commonVariations.shsource
@@ -55,6 +55,11 @@ export BUILD_ALWAYS_TO_ADDRESS=david_williams@us.ibm.com
export FAILED_ADDRESS=wtp-releng@eclipse.org
export BUILD_SUBJECT_PREFIX=WTPBUILD:
+# note: this file, notifyMapper.properties is not normally in cvs,
+# to avoid "publishing" email addresses; but is maintained directly on
+# the build server.
+export EMAIL_PROPERTIES=${BUILD_HOME}/notification/notifyMapper.properties
+
# controls quietness of logging to console
# false means more output to console, true uses ant's logger
export USE_LOGGER=true
--
GitLab