[Fuego] [PATCH 26/30] bang: replace the jenkins script

Daniel Sangorrin daniel.sangorrin at toshiba.co.jp
Mon Jun 4 07:18:00 UTC 2018


This alone is a milestone!

Signed-off-by: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
---
 engine/scripts/ftc | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/engine/scripts/ftc b/engine/scripts/ftc
index d0b6a94..12bedb3 100755
--- a/engine/scripts/ftc
+++ b/engine/scripts/ftc
@@ -1206,6 +1206,13 @@ def link_key(item):
 
 
 def create_job(board, test):
+    global debug
+
+    if debug == 1:
+        debug_param = "--debug"
+    else:
+        debug_param = ""
+
     flot_link = '<flotile.FlotPublisher plugin="flot at 1.0-SNAPSHOT"/>'
 
     # prepare links for the descriptionsetter plugin
@@ -1291,14 +1298,8 @@ def create_job(board, test):
     <customWorkspace>$FUEGO_RW/buildzone</customWorkspace>
     <builders>
     <hudson.tasks.Shell>
-        <command>export Reboot={reboot}
-export Rebuild={rebuild}
-export Target_PreCleanup={precleanup}
-export Target_PostCleanup={postcleanup}
-export TESTDIR={testdir}
-export TESTSPEC={testspec}
-#export FUEGO_DEBUG=1
-timeout --signal=9 {timeout} /bin/bash $FUEGO_CORE/engine/scripts/main.sh
+        <command>export FUEGO_CALLER="jenkins"
+ftc run-test -b $NODE_NAME -t {testdir} -s {testspec} --timeout {timeout} --reboot {reboot} --rebuild {rebuild} --precleanup {precleanup} --postcleanup {postcleanup} {debug_param}
 </command>
     </hudson.tasks.Shell>
     </builders>
@@ -1317,7 +1318,8 @@ timeout --signal=9 {timeout} /bin/bash $FUEGO_CORE/engine/scripts/main.sh
 """.format(board=board, reboot=test.reboot, rebuild=test.rebuild,
         precleanup=test.precleanup, postcleanup=test.postcleanup,
         testdir=test.name, testspec=test.spec, timeout=test.timeout,
-        flot_link=flot_link, success_links=success_links, fail_links=fail_links))
+        flot_link=flot_link, success_links=success_links, fail_links=fail_links,
+        debug_param=debug_param))
     fd.close()
 
     job_name = board + "." + test.spec + "." + test.name
-- 
2.7.4




More information about the Fuego mailing list