diff options
Diffstat (limited to 'test/e2e_tests/e2e_test_external_master_start.sh')
| -rwxr-xr-x | test/e2e_tests/e2e_test_external_master_start.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/test/e2e_tests/e2e_test_external_master_start.sh b/test/e2e_tests/e2e_test_external_master_start.sh index 3e54d9b..e787fcb 100755 --- a/test/e2e_tests/e2e_test_external_master_start.sh +++ b/test/e2e_tests/e2e_test_external_master_start.sh @@ -33,7 +33,10 @@ if [ ! -z "$USE_LXC_TEST" ]; then echo "starting external e2e test 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_TARGET_DIR/vsomeip_lib/test; ./e2e_test_external_slave_start.sh $SERVICE_JSON_FILE\"" & elif [ ! -z "$USE_DOCKER" ]; then - docker run --name citms --cap-add NET_ADMIN $DOCKER_IMAGE sh -c "route add -net 224.0.0.0/4 dev eth0 && cd $DOCKER_TESTS && ./e2e_test_external_slave_start.sh $SERVICE_JSON_FILE" & + docker exec $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && ./e2e_test_external_slave_start.sh $SERVICE_JSON_FILE" & +elif [ ! -z "$JENKINS" ]; then + ssh -tt -i $PRV_KEY -o StrictHostKeyChecking=no jenkins@$IP_SLAVE "bash -ci \"set -m; cd $WS_ROOT/build/test; ./e2e_test_external_slave_start.sh $SERVICE_JSON_FILE\" >> $WS_ROOT/slave_test_output 2>&1" & + else cat <<End-of-message ******************************************************************************* @@ -60,11 +63,6 @@ do fi done -if [ ! -z "$USE_DOCKER" ]; then - docker stop citms - docker rm citms -fi - kill $PID_CLIENT # Check if both exited successfully |