diff options
| author | Xiang Dai <long0dai@foxmail.com> | 2020-07-30 14:16:55 +0800 |
|---|---|---|
| committer | Xiang Dai <long0dai@foxmail.com> | 2020-08-17 17:22:10 +0800 |
| commit | 509dcbf79f47ddbd149fed403f003ef6b730c1cc (patch) | |
| tree | 6bb30b4546603c1dbec2ed48023d9603dd479e1d /edge/test/integration | |
| parent | Merge pull request #2069 from fisherxu/keadm-getversion (diff) | |
| download | kubeedge-509dcbf79f47ddbd149fed403f003ef6b730c1cc.tar.gz | |
Do not send SIGKILL to stop process
Signed-off-by: Xiang Dai <long0dai@foxmail.com>
Diffstat (limited to 'edge/test/integration')
| -rwxr-xr-x | edge/test/integration/scripts/execute.sh | 2 | ||||
| -rw-r--r-- | edge/test/integration/utils/test_setup.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/edge/test/integration/scripts/execute.sh b/edge/test/integration/scripts/execute.sh index fa8a348c0..db6c21e88 100755 --- a/edge/test/integration/scripts/execute.sh +++ b/edge/test/integration/scripts/execute.sh @@ -17,7 +17,7 @@ TEST_DIR=$(dirname $(dirname "${BASH_SOURCE[0]}")) function cleanup() { - sudo pkill -9 edgecore || true + sudo pkill edgecore || true while true; do sleep 1 ps faux | grep -q [e]dgecore || break diff --git a/edge/test/integration/utils/test_setup.go b/edge/test/integration/utils/test_setup.go index 9e1c6a475..dc40218e9 100644 --- a/edge/test/integration/utils/test_setup.go +++ b/edge/test/integration/utils/test_setup.go @@ -16,7 +16,7 @@ import ( const ( EdgeCoreConfigFile = "/tmp/edgecore.yaml" CatEdgeCoreConfigFile = "cat /tmp/edgecore.yaml" - RunEdgecore = "sudo pkill -9 edgecore; cd ${KUBEEDGE_ROOT}/_output/local/bin/; sudo nohup ./edgecore --config=" + EdgeCoreConfigFile + " > edgecore.log 2>&1 &" + RunEdgecore = "sudo pkill edgecore; cd ${KUBEEDGE_ROOT}/_output/local/bin/; sudo nohup ./edgecore --config=" + EdgeCoreConfigFile + " > edgecore.log 2>&1 &" CheckEdgecore = "sudo pgrep edgecore" CatEdgecoreLog = "cat ${KUBEEDGE_ROOT}/_output/local/bin/edgecore.log" DBFile = "/tmp/edgecore/edgecore.db" |