[PATCH v2 compass-ci] sbin/run_job: update the script

[why] 1.host-info is adapted in physical machine, so replace yaml-file 2.after running multi-docker and multi-qemu, these processes need to be deleted Signed-off-by: Hu XueJiao <1034502035@qq.com> --- sbin/run_job | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sbin/run_job b/sbin/run_job index 325fa9f..7405ca0 100755 --- a/sbin/run_job +++ b/sbin/run_job @@ -24,7 +24,7 @@ submit_one_job() submit_job() { - yaml_args=("$cci_makepkg_file" "host-info.yaml") + yaml_args=("$cci_makepkg_file" "ebizzy.yaml") for yaml in "${yaml_args[@]}" do submit_one_job & @@ -72,6 +72,18 @@ run_docker() done } +kill_all() +{ + for line in $(cat "$1") + do + [ -z "$ line" ] && break + kill -9 "$line" + done +} + run_qemu run_docker wait + +kill_all pid +kill_all $CCI_SRC/providers/dc.pid -- 2.23.0

On Tue, Jan 12, 2021 at 03:26:14PM +0800, Hu Xuejiao wrote:
[why] 1.host-info is adapted in physical machine, so replace yaml-file
=> so replace it with "ebizzy.yaml".
2.after running multi-docker and multi-qemu, these processes need to be deleted
deleted => killed 'kill -9' is a dangerous command, you'd better not use it. Maybe you can let the process quit or return by itself. Thanks, Yuanchao
Signed-off-by: Hu XueJiao <1034502035@qq.com> --- sbin/run_job | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/sbin/run_job b/sbin/run_job index 325fa9f..7405ca0 100755 --- a/sbin/run_job +++ b/sbin/run_job @@ -24,7 +24,7 @@ submit_one_job()
submit_job() { - yaml_args=("$cci_makepkg_file" "host-info.yaml") + yaml_args=("$cci_makepkg_file" "ebizzy.yaml") for yaml in "${yaml_args[@]}" do submit_one_job & @@ -72,6 +72,18 @@ run_docker() done }
+kill_all() +{ + for line in $(cat "$1") + do + [ -z "$ line" ] && break + kill -9 "$line" + done +} + run_qemu run_docker wait + +kill_all pid +kill_all $CCI_SRC/providers/dc.pid -- 2.23.0
participants (2)
-
Hu Xuejiao
-
Li Yuanchao