diff options
Diffstat (limited to 'test/payload_tests/external_local_payload_test_client_external_starter.sh')
| -rwxr-xr-x | test/payload_tests/external_local_payload_test_client_external_starter.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/payload_tests/external_local_payload_test_client_external_starter.sh b/test/payload_tests/external_local_payload_test_client_external_starter.sh index 89541b9..da6ca08 100755 --- a/test/payload_tests/external_local_payload_test_client_external_starter.sh +++ b/test/payload_tests/external_local_payload_test_client_external_starter.sh @@ -58,8 +58,10 @@ SERIVCE_PID=$! # to finish the test successfully if [ ! -z "$USE_LXC_TEST" ]; then echo "starting external local payload on slave LXC" - ssh -tt -i $SANDBOX_ROOT_DIR/commonapi_main/lxc-config/.ssh/mgc_lxc/rsa_key_file.pub -o StrictHostKeyChecking=no root@$LXC_TEST_SLAVE_IP "bash -ci \"set -m; cd \\\$SANDBOX_ROOT_DIR/ctarget/vsomeip/test; ./external_local_payload_test_client_external_start.sh\"" & + ssh -tt -i $SANDBOX_ROOT_DIR/commonapi_main/lxc-config/.ssh/mgc_lxc/rsa_key_file.pub -o StrictHostKeyChecking=no root@$LXC_TEST_SLAVE_IP "bash -ci \"set -m; cd \\\$SANDBOX_TARGET_DIR/vsomeip/test; ./external_local_payload_test_client_external_start.sh\"" & echo "remote ssh job id: $!" +elif [ ! -z "$USE_DOCKER" ]; then + docker run --name elptces $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && ./external_local_payload_test_client_external_start.sh" & else cat <<End-of-message ******************************************************************************* @@ -110,6 +112,10 @@ check_tcp_udp_sockets_are_open $SERIVCE_PID 2 # with a non-zero exit code wait $SERIVCE_PID || ((FAIL+=1)) +if [ ! -z "$USE_DOCKER" ]; then + docker wait elptces + docker rm elptces +fi # Check if server exited sucessfully if [ $FAIL -eq 0 ] |