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

Tim.Bird at sony.com Tim.Bird at sony.com
Wed Jun 6 23:00:01 UTC 2018


Comments inline below...

> -----Original Message-----
> From: Daniel Sangorrin
> 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 = ""
> +
This merging of the environment variable used by the Fuego
core scripts, and the 'debug' variable used by ftc, results in
a loss of functionality.  The FUEGO_DEBUG variable supports
multiple bit-wise flags, to debug different parts of the
run.  The 'ftc' debug variable did not.
See http://fuegotest.org/wiki/FUEGO_DEBUG

What probably needs to happen is to have '--debug' take an argument,
for the debug value.  I'm applying this patch, because the more important
aspect of this is the conversion from calling main.sh to ftc from the
Jenkins job.  But one of us should circle back and fix the debug flag
value handling.

>      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


Applied, but not pushed yet.
 -- Tim



More information about the Fuego mailing list