[Fuego] [PATCH 12/16] description setter: put log if the test fails
Daniel Sangorrin
daniel.sangorrin at toshiba.co.jp
Thu Mar 30 01:04:40 UTC 2017
Before log was set by default, but as Tim noticed the
fail case was not considered.
Signed-off-by: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
---
engine/scripts/ftc | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/engine/scripts/ftc b/engine/scripts/ftc
index 6f7d635..82a8c18 100755
--- a/engine/scripts/ftc
+++ b/engine/scripts/ftc
@@ -751,6 +751,7 @@ def create_job(board, testplan, test, timeout, reboot, rebuild, precleanup, post
# prepare links for descriptionsetter. Put a link to testlog.txt by default
template_link = '<a href="/fuego/userContent/fuego.logs/%s/${NODE_NAME}.${BUILD_ID}.${BUILD_ID}/%%s">%%s</a>' % test
html_links = template_link % ('testlog.txt', 'log')
+ failed_links = html_links
if jobextralinks != 'None':
for key, value in jobextralinks.iteritems():
html_links = html_links + ' ' + template_link % (value, key)
@@ -788,17 +789,18 @@ timeout --signal=9 {timeout} /bin/bash $FUEGO_CORE/engine/tests/${{TESTDIR}}/${{
<publishers>
{flot_link}
<hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter at 1.10">
- <regexp></regexp>
- <regexpForFailed></regexpForFailed>
- <description>{html_links}</description>
- <setForMatrix>false</setForMatrix>
+ <regexp></regexp>
+ <regexpForFailed></regexpForFailed>
+ <description>{html_links}</description>
+ <descriptionForFailed>{failed_links}</descriptionForFailed>
+ <setForMatrix>false</setForMatrix>
</hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
</publishers>
<buildWrappers/>
</project>
""".format(board=board, reboot=str(reboot), rebuild=str(rebuild), precleanup=str(precleanup), postcleanup=str(postcleanup),
testdir=str(test), testname=str(test).split('.')[1],
- testplan=testplan, timeout=timeout, flot_link=flot_link, html_links=html_links))
+ testplan=testplan, timeout=timeout, flot_link=flot_link, html_links=html_links, failed_links=failed_links))
fd.close()
print("Creating job " + test)
--
2.7.4
More information about the Fuego
mailing list