Revert "bin/run-local: add option -t for lkp install/run in tbox"

This reverts commit 8f76ffe70f96ac3abe4fdc7b511292c7300d2510.

months ago, Kemi Wang has added a patchset to rewrite the monitor
b9e2a2fe5("Daemons: Kill daemon(s) when task is finished")

After that this patch is no longer needed, and this usage is only used
on lkp-install-run tools

revert this patch will help to fix:
gzip: /lkp/result/perf-bench-sched-pipe/10000000ops-process/ubuntu18/ubuntu/x86_64-rhel-7.6/gcc-7/4.18.0-15-generic/0/sched_debug.gz: unexpected end of file

it's caused by some background monitors are not exited when it's output is being processed.

Signed-off-by: Li Zhijian <zhijianx.li@intel.com>
Signed-off-by: Philip Li <philip.li@intel.com>

1 files changed, 3 insertions, 17 deletions

diff --git a/bin/run-local b/bin/run-local
index 36416e44..548975df 100755
--- a/bin/run-local
+++ b/bin/run-local
@@ -28,7 +28,6 @@ ENV['BENCHMARK_ROOT'] = '/lkp/benchmarks'
 
 $opt_result_root = 'result'
 $opt_set_key_value = {}
-options = {in_tbox: false}
 
 opt_parser = OptionParser.new do |opts|
   opts.banner = 'Usage: run-local [-o RESULT_ROOT] JOBFILE'
@@ -44,10 +43,6 @@ opt_parser = OptionParser.new do |opts|
     $opt_set_key_value.merge!(YAML.load(key_value))
   end
 
-  opts.on('-t', '--tbox', 'running in tbox') do
-    options[:in_tbox] = true
-  end
-
   opts.on_tail('-h', '--help', 'Show this message') do
     puts opts
     exit
@@ -138,19 +133,10 @@ File.open(job_script, 'w', 0o775) do |file|
   file.puts jobx.to_shell
 end
 
-if options[:in_tbox]
-  # if we don't delete the watchdog step in job.sh,
-  # the run-local will wake up a new monitor
-  # which may impact the monitor from job itself in tbox
-  system 'sed -i "/monitors\/plain\/watchdog/d" ', job_script
-else
-  system 'killall', '-q', LKP_SRC + '/bin/event/wakeup'
-end
+system 'killall', '-q', LKP_SRC + '/bin/event/wakeup'
 system job_script, 'run_job'
-unless options[:in_tbox]
-  system LKP_SRC + '/bin/run-with-job', job_script, LKP_SRC + '/bin/post-run'
-  system LKP_SRC + '/bin/event/wakeup', 'job-finished'
-end
+system LKP_SRC + '/bin/run-with-job', job_script, LKP_SRC + '/bin/post-run'
+system LKP_SRC + '/bin/event/wakeup', 'job-finished'
 
 job.save result_root + '/job.yaml'