diff options
| author | Lutz Bichler <Lutz.Bichler@bmw.de> | 2020-02-12 13:04:15 +0100 |
|---|---|---|
| committer | Lutz Bichler <Lutz.Bichler@bmw.de> | 2020-02-12 13:04:15 +0100 |
| commit | 8371cdca9463a75220c4de92b47c8df9d3bbe346 (patch) | |
| tree | 16b4bf73c284b026b0ac032171110dafd1752196 /test/offer_tests/conf/offer_test_external_master_starter.sh.in | |
| parent | ee44d19e0a3773adcda3bace073c66e334a3e6a7 (diff) | |
| download | vSomeIP-8371cdca9463a75220c4de92b47c8df9d3bbe346.tar.gz | |
vsomeip 3.1.7.13.1.7.1
Diffstat (limited to 'test/offer_tests/conf/offer_test_external_master_starter.sh.in')
| -rwxr-xr-x | test/offer_tests/conf/offer_test_external_master_starter.sh.in | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/test/offer_tests/conf/offer_test_external_master_starter.sh.in b/test/offer_tests/conf/offer_test_external_master_starter.sh.in index 0f8f104..272689a 100755 --- a/test/offer_tests/conf/offer_test_external_master_starter.sh.in +++ b/test/offer_tests/conf/offer_test_external_master_starter.sh.in @@ -23,7 +23,7 @@ FAIL=0 CLIENT_PIDS=() export VSOMEIP_CONFIGURATION=offer_test_external_master.json # start daemon -../daemon/./vsomeipd & +../examples/routingmanagerd/./routingmanagerd & PID_VSOMEIPD=$! # Start the services ./offer_test_service 2 & @@ -40,10 +40,12 @@ if [ ! -z "$USE_LXC_TEST" ]; then echo "Waiting for 5s" sleep 5 echo "starting offer test on slave LXC offer_test_external_slave_starter.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; ./offer_test_external_slave_starter.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_lib/test; ./offer_test_external_slave_starter.sh\"" & echo "remote ssh pid: $!" elif [ ! -z "$USE_DOCKER" ]; then - docker run --name otems --cap-add NET_ADMIN $DOCKER_IMAGE sh -c "route add -net 224.0.0.0/4 dev eth0 && cd $DOCKER_TESTS && sleep 10; ./offer_test_external_slave_starter.sh" & + echo "Waiting for 5s" + sleep 5 + docker exec $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && sleep 10; ./offer_test_external_slave_starter.sh" & else cat <<End-of-message ******************************************************************************* @@ -72,11 +74,6 @@ done kill $PID_VSOMEIPD sleep 1 -if [ ! -z "$USE_DOCKER" ]; then - docker stop otems - docker rm otems -fi - # wait for slave to finish for job in $(jobs -p) do @@ -95,7 +92,7 @@ done CLIENT_PIDS=() export VSOMEIP_CONFIGURATION=offer_test_external_master.json # start daemon -../daemon/./vsomeipd & +../examples/routingmanagerd/./routingmanagerd & PID_VSOMEIPD=$! # Start the services ./offer_test_service 2 & @@ -111,10 +108,12 @@ if [ ! -z "$USE_LXC_TEST" ]; then echo "Waiting for 5s" sleep 5 echo "starting offer test on slave LXC offer_test_external_sd_msg_sender" - 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; ./offer_test_external_sd_msg_sender $LXC_TEST_MASTER_IP\"" & + 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; ./offer_test_external_sd_msg_sender $LXC_TEST_MASTER_IP\"" & echo "remote ssh job id: $!" elif [ ! -z "$USE_DOCKER" ]; then - docker run --name otesms --cap-add NET_ADMIN $DOCKER_IMAGE sh -c "route add -net 224.0.0.0/4 dev eth0 && cd $DOCKER_TESTS && sleep 10; ./offer_test_external_sd_msg_sender $DOCKER_IP" & + echo "Waiting for 5s" + sleep 5 + docker exec $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && sleep 10; ./offer_test_external_sd_msg_sender $DOCKER_IP" & else cat <<End-of-message ******************************************************************************* @@ -141,11 +140,6 @@ done kill $PID_VSOMEIPD sleep 1 -if [ ! -z "$USE_DOCKER" ]; then - docker stop otesms - docker rm otesms -fi - # wait for slave to finish for job in $(jobs -p) do |