[PATCH v3 lkp-tests] (job2sh.rb) add on_fail to job.sh

[why] If job.yaml is defined: on_fail: sleep(tests): 300(runtime) [how] By sh_on_fail, it will appear in job.sh: on_fail() { . $LKP_SRC/lib/http.sh . $LKP_SRC/lib/job.sh . $LKP_SRC/lib/env.sh export_top_env run_test $LKP_SRC/tests/wrapper sleep 500 } Signed-off-by: Hu XueJiao <1034502035@qq.com> --- lib/job2sh.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/job2sh.rb b/lib/job2sh.rb index 6e00b088..7d2c2d5c 100755 --- a/lib/job2sh.rb +++ b/lib/job2sh.rb @@ -367,9 +367,7 @@ class Job2sh < Job @programs = available_programs(:workload_elements) - if !job - job = (@jobx || @job).clone - end + job ||= (@jobx || @job).clone @cur_func = :on_fail -- 2.23.0

On Wed, Nov 04, 2020 at 06:04:07PM +0800, Hu Xuejiao wrote:
[why] If job.yaml is defined: on_fail: sleep(tests): 300(runtime)
Why add on_fail in job.yaml? Thanks, Zhangyu
[how] By sh_on_fail, it will appear in job.sh: on_fail() { . $LKP_SRC/lib/http.sh . $LKP_SRC/lib/job.sh . $LKP_SRC/lib/env.sh
export_top_env
run_test $LKP_SRC/tests/wrapper sleep 500 }
Signed-off-by: Hu XueJiao <1034502035@qq.com> --- lib/job2sh.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lib/job2sh.rb b/lib/job2sh.rb index 6e00b088..7d2c2d5c 100755 --- a/lib/job2sh.rb +++ b/lib/job2sh.rb @@ -367,9 +367,7 @@ class Job2sh < Job
@programs = available_programs(:workload_elements)
- if !job - job = (@jobx || @job).clone - end + job ||= (@jobx || @job).clone
@cur_func = :on_fail
-- 2.23.0
participants (2)
-
Hu Xuejiao
-
Zhang Yu