FCL/sftools/dev/build: comparison buildframework/helium/config/signaling_config

equal deleted inserted replaced

-:be27ed110b50
+:d8ac696cc51f
 <taskdef resource="org/apache/tools/ant/types/conditions/antlib.xml" />
 <!-- Only for backward compatibility -->
 <hlm:notifierList id="defaultSignalFailNotifier">
-<hlm:emailNotifier templateSrc="${helium.dir}/tools/common/templates/log/email_new.html.ftl" title="[signal] ${signal.name}"
+<hlm:emailNotifier templateSrc="${helium.dir}/tools/common/templates/log/email_new.html.ftl" title="[signal] ${signal.name} - [message] ${signal.message}"
 smtp="${email.smtp.server}" ldap="${email.ldap.server}" notifyWhen="fail">
 </hlm:emailNotifier>
 </hlm:notifierList>
 <hlm:notifierList id="defaultFailNotifier">
-<hlm:emailNotifier defaultTemplate="${helium.dir}/tools/common/templates/log/email_default.html.ftl" title="[signal] ${signal.name}"
+<hlm:emailNotifier defaultTemplate="${helium.dir}/tools/common/templates/log/email_default.html.ftl" title="[signal] ${signal.name} - [message] ${signal.message}"
 smtp="${email.smtp.server}" ldap="${email.ldap.server}" notifyWhen="fail">
 </hlm:emailNotifier>
 </hlm:notifierList>
 <hlm:signalInput id="compileSignalInput" failbuild="defer">
 <hlm:notifierListRef refid="defaultFailNotifier" />
 </hlm:signalInput>
+<hlm:signalInput id="raptorErrorSignalInput" failbuild="now">
+<hlm:notifierListRef refid="defaultFailNotifier" />
+</hlm:signalInput>
 <hlm:signalInput id="eeRomsSignalInput" failbuild="never">
 <hlm:notifierListRef refid="defaultAlwaysNotifier" />
 </hlm:signalInput>
 <hlm:signalInput id="subconRomsSignalInput" failbuild="never">
 <hlm:targetCondition>
 <hlm:hasSeverity severity="error" file="${build.cache.log.dir}/signals/${build.id}_ccm_get_input.log.status.xml" />
 </hlm:targetCondition>
 <signalNotifierInput>
 <signalInput refid="prepWorkAreaSignalInput" />
-<notifierInput file = "${build.cache.log.dir}/signals/${build.id}_ccm_get_input.log.status.html" />
+<notifierInput>
+<fileset dir="${build.cache.log.dir}" >
+<include name="signals/${build.id}_ccm_get_input*" />
+<include name="${build.id}_ccm_get_input*" />
+</fileset>
+</notifierInput>
 </signalNotifierInput>
 </hlm:signalListenerConfig>
 <hlm:signalListenerConfig id="preparationSignal" target="prep-fail" message="Errors during preparation">
 <targetCondition>
 <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_ant_build.log.status.xml" />
 </targetCondition>
 <signalNotifierInput>
 <signalInput refid="preparationSignalInput" />
-<notifierInput file = "${build.signal.status.dir}/${build.id}_ant_build.log.status.html" />
+<notifierInput>
+<fileset dir="${build.log.dir}" >
+<include name="**/${build.id}_main.ant*" />
+</fileset>
+</notifierInput>
 </signalNotifierInput>
 </hlm:signalListenerConfig>
 <hlm:signalListenerConfig id="eeRomsSignal" target="ee-roms" message="Errors happened during ee rom image">
 <targetCondition>
 <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_ee_roms.log.status.xml" />
 </targetCondition>
 <signalNotifierInput>
 <signalInput refid="eeRomsSignalInput" />
-<notifierInput file = "${build.signal.status.dir}/${build.id}_ee_roms.log.html" />
+<notifierInput>
+<fileset dir="${build.log.dir}" >
+<include name="**/${build.id}_ee_roms*" />
+</fileset>
+</notifierInput>
 </signalNotifierInput>
 </hlm:signalListenerConfig>
 <hlm:signalListenerConfig id="subconRomsSignal" target="subcon-roms" message="Errors happened during subcon rom image">
 <hlm:targetCondition>
 <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_subcon_roms.log.status.xml" />
 </hlm:targetCondition>
 <signalNotifierInput>
 <signalInput refid="subconRomsSignalInput" />
-<notifierInput file = "${build.signal.status.dir}/${build.id}_subcon.log.status.html" />
+<notifierInput>
+<fileset dir="${build.log.dir}" >
+<include name="**/${build.id}_subcon*" />
+</fileset>
+</notifierInput>
 </signalNotifierInput>
 </hlm:signalListenerConfig>
 <hlm:signalListenerConfig id="traceRomsSignal" target="trace-roms" message="Errors happened during trace rom">
 <hlm:targetCondition>
 <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_trace_roms.log.xml" />
 </hlm:targetCondition>
 <signalNotifierInput>
 <signalInput refid="traceRomsSignalInput" />
-<notifierInput file = "${build.signal.status.dir}/${build.id}_trace_roms.log.html" />
+<notifierInput>
+<fileset dir="${build.log.dir}" >
+<include name="**/${build.id}_trace_roms*" />
+</fileset>
+</notifierInput>
 </signalNotifierInput>
 </hlm:signalListenerConfig>
 <hlm:signalListenerConfig id="fotaSignal" target="fota-a-build" message="Fota execution finished">
 <hlm:targetCondition>
 <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_fota.log.xml" />
 </hlm:targetCondition>
 <signalNotifierInput>
 <signalInput refid="fotaSignalInput" />
-<notifierInput file = "${build.signal.status.dir}/${build.id}_fota.log.status.html" />
+<notifierInput>
+<fileset dir="${build.log.dir}" >
+<include name="**/${build.id}_fota*" />
+</fileset>
+</notifierInput>
 </signalNotifierInput>
 </hlm:signalListenerConfig>
 <hlm:signalListenerConfig id="dataPackagingSignal" target="build-icreatordp" message="DP creation finished">
 <hlm:targetCondition>
 <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_dp.log.status.xml" />
 </hlm:targetCondition>
 <signalNotifierInput>
 <signalInput refid="dataPackagingSignalInput" />
-<notifierInput file = "${build.signal.status.dir}/${build.id}_dp.log.status.html" />
+<notifierInput>
+<fileset dir="${build.log.dir}" >
+<include name="**/${build.id}_dp*" />
+</fileset>
+</notifierInput>
 </signalNotifierInput>
 </hlm:signalListenerConfig>
 <hlm:signalInput id="atsSignalInput" failbuild="defer">
 <hlm:notifierListRef refid="defaultFailNotifier" />
 <targetCondition>
 <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_ats.log.status.xml" />
 </targetCondition>
 <signalNotifierInput>
 <signalInput refid="atsSignalInput" />
-<notifierInput file = "${build.signal.status.dir}/${build.id}_ats.log.status.html" />
+<notifierInput>
+<fileset dir="${build.log.dir}" >
+<include name="**/${build.id}_ats*" />
+</fileset>
+</notifierInput>
 </signalNotifierInput>
 </hlm:signalListenerConfig>
 <hlm:signalListenerConfig id="asteSignal" target="ats-aste" message="ASTE finished">
 <hlm:targetCondition>
-<hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_ats.log.status.xml" />
+<hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_aste.log.status.xml" />
 </hlm:targetCondition>
 <signalNotifierInput>
 <signalInput refid="atsSignalInput" />
-<notifierInput file = "${build.signal.status.dir}/${build.id}_ats.log.status.html" />
+<notifierInput>
+<fileset dir="${build.log.dir}" >
+<include name="**/${build.id}_aste*" />
+</fileset>
+</notifierInput>
 </signalNotifierInput>
 </hlm:signalListenerConfig>
 <hlm:signalListenerConfig id="mattiSignal" target="matti-test" message="ATS MATTI creation finished">
 <targetCondition>
-<hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_ats.log.status.xml" />
+<hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_matti.log.status.xml" />
 </targetCondition>
 <signalNotifierInput>
 <signalInput refid="atsSignalInput" />
-<notifierInput file = "${build.signal.status.dir}/${build.id}_ats.log.status.html" />
+<notifierInput>
+<fileset dir="${build.log.dir}" >
+<include name="**/${build.id}_matti*" />
+</fileset>
+</notifierInput>
 </signalNotifierInput>
 </hlm:signalListenerConfig>
 <hlm:signalListenerConfig id="publishSignal" target="publish" message="content published">
 <signalNotifierInput>
 <hlm:notifierListRef refid="defaultFailNotifier" />
 </hlm:signalInput>
 <hlm:signalListenerConfig id="signalValidatePolicyInvalidOrMissing" target="render-validate-policy" message="Policy file validation">
 <targetCondition>
-<hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_validate_policy.log.status.xml" />
+<hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_validate-policy.summary.status.xml" />
 </targetCondition>
 <signalNotifierInput>
 <signalInput refid="signalValidatePolicyInvalidOrMissingInput" />
-<notifierInput file = "${build.signal.status.dir}/${build.id}_validate_policy.log.status.html" />
+<notifierInput>
+<fileset dir="${build.log.dir}" >
+<include name="**/${build.id}_validate-policy*" />
+</fileset>
+<fileset dir="${build.log.dir}" >
+<include name="**/${build.id}_validate-policy*" />
+</fileset>
+</notifierInput>
 </signalNotifierInput>
 </hlm:signalListenerConfig>
 <hlm:signalInput id="canonicalSysDefFailSignalInput" failbuild="now">
 <hlm:notifierListRef refid="defaultFailNotifier" />
 <targetCondition>
 <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_getenv.log.status.xml" />
 </targetCondition>
 <signalNotifierInput>
 <signalInput refid="getenvSignalInput" />
-<notifierInput file = "${build.signal.status.dir}/${build.id}_getenv.log.status.html" />
+<notifierInput>
+<fileset dir="${build.log.dir}" >
+<include name="**/${build.id}_getenv*" />
+</fileset>
+</notifierInput>
 </signalNotifierInput>
 </hlm:signalListenerConfig>
 <hlm:signalInput id="signalConfigureQtInput" failbuild="defer">
 <hlm:notifierListRef refid="defaultFailNotifier" />
 </hlm:signalInput>
+<hlm:signalInput id="exceptionSignalInput" failbuild="defer">
+<hlm:notifierListRef refid="defaultFailNotifier" />
+</hlm:signalInput>
 <hlm:signalListenerConfig id="signalConfigureQt" target="configure-qt" message="Configuring Qt framework">
 <targetCondition>
 <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${qt.configure.log.name}.status.xml" />
 </targetCondition>
 <signalNotifierInput>
 <signalInput refid="signalConfigureQtInput" />
-<notifierInput file = "${build.signal.status.dir}/${qt.configure.log.name}.status.html" />
+<notifierInput>
-</signalNotifierInput>
+<fileset dir="${build.log.dir}" >
-</hlm:signalListenerConfig>
+<include name="**/${qt.configure.log.name}*" />
+</fileset>
-<!-- Signal configuration for a signal sent when the build fails completely. -->
+</notifierInput>
-<hlm:signalInput id="buildExceptionSignalInput" failbuild="never">
+</signalNotifierInput>
-<hlm:notifierListRef refid="defaultFailNotifier"/>
+</hlm:signalListenerConfig>
-</hlm:signalInput>
-<property name="signals.buildexception.signalinput" value="buildExceptionSignalInput"/>
 <hlm:signalInput id="signalRunQMakeInput" failbuild="defer">
 <hlm:notifierListRef refid="defaultFailNotifier" />
 </hlm:signalInput>
 <hlm:hasSeverity severity="error" file="${build.signal.status.dir}/${build.id}_sisfiles.log.status.xml"
 />
 </hlm:targetCondition>
 <signalNotifierInput>
 <signalInput refid="sisfilesSignalInput" />
-<notifierInput file = "${build.signal.status.dir}/${build.id}_sisfiles.log.status.html" />
+<notifierInput>
-</signalNotifierInput>
+<fileset dir="${build.log.dir}" >
-</hlm:signalListenerConfig>
+<include name="**/${build.id}_sisfiles*" />
+</fileset>
+</notifierInput>
+</signalNotifierInput>
+</hlm:signalListenerConfig>
 </project>

changeset 179	d8ac696cc51f
parent 1	be27ed110b50
child 217	0f5e3a7fb6af