fix: Fix sd-local display bug

[yakanechi]

Context

In sd-local, there was a bug that the sd-setup-launcher command and output was displayed in the job step as follows when using images such as centos7 with /bin/sh as bash.

The reason for this is that the echo ; at the end of the sd-setup-local command is a return condition, so the output of the command is left out and displayed in later job steps.

INFO   [0000] Prepare to start build...                    
INFO   [0012] Pulling docker image from centos:centos7...  
sd-setup-launcher: set -e && export PATH=${PATH}:/opt/sd:/usr/sd/bin:/usr/sd-static/bin && finish() { EXITCODE=$?; tmpfile=/tmp/env_tmp; exportfile=/tmp/env_export; export -p | grep -vi "PS1=" > $tmpfile && mv -f $tmpfile $exportfile; echo $SD_STEP_ID $EXITCODE; } && trap finish ABRT EXIT;
sd-setup-launcher: echo ;
case1: $ echo "Hello world"
case1: set -e && export PATH=${PATH}:/opt/sd:/usr/sd/bin:/usr/sd-static/bin && finish() { EXITCODE=$?; tmpfile=/tmp/<n && finish() { EXITCODE=$?; tmpfile=/tmp/env_tmp; exportfile=/tmp/env_export; export -p | grep -vi "PS1=" > $tmpfi</env_export; export -p | grep -vi "PS1=" > $tmpfile && mv -f $tmpfile $exportfile; echo $SD_STEP_ID $EXITCODE; } && trap finish ABRT EXIT;                                                          
case1: echo ;
case1: 
case1: Hello world
case1:

Objective

Prevent the sd-setup-launcher command and output from appearing in the job step by making the output of echo ; a Return condition.

References

License

I confirm that this contribution is made under the terms of the license found in the root directory of this repository's source tree and that I have the authority necessary to make this contribution on behalf of its copyright owner.

[yakanechi]

It succeeds locally but fails with a timeout here.

[jithine]

@yakanechi can you try running your local test inside the same container SD build uses ? https://github.com/screwdriver-cd/launcher/blob/master/screwdriver.yaml#L7

Perhaps use sd-local itself here :)

[yakanechi]

@jithine
Thanks for your comment, it helped me solve the problem.
In the test environment,set -e was failing because it was outputting# characters, so a newline was added to separate the output of echo ;.

[ibu1224]

👍