diff options
Diffstat (limited to 'test/subscribe_notify_one_tests')
| -rwxr-xr-x | test/subscribe_notify_one_tests/subscribe_notify_one_test_master_starter.sh | 5 | ||||
| -rwxr-xr-x | test/subscribe_notify_one_tests/subscribe_notify_one_test_slave_starter.sh | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/test/subscribe_notify_one_tests/subscribe_notify_one_test_master_starter.sh b/test/subscribe_notify_one_tests/subscribe_notify_one_test_master_starter.sh index 75e948e..a53104f 100755 --- a/test/subscribe_notify_one_tests/subscribe_notify_one_test_master_starter.sh +++ b/test/subscribe_notify_one_tests/subscribe_notify_one_test_master_starter.sh @@ -38,7 +38,7 @@ export VSOMEIP_APPLICATION_NAME=subscribe_notify_one_test_service_three export VSOMEIP_CONFIGURATION=$MASTER_JSON_FILE ./subscribe_notify_one_test_service 3 $RELIABILITY_TYPE & -sleep 1 +sleep 3 if [ ! -z "$USE_LXC_TEST" ]; then echo "starting subscribe_notify_one_test_slave_starter.sh on slave LXC with parameters $CLIENT_JSON_FILE" @@ -46,6 +46,9 @@ if [ ! -z "$USE_LXC_TEST" ]; then echo "remote ssh job id: $!" elif [ ! -z "$USE_DOCKER" ]; then docker exec $DOCKER_IMAGE sh -c "cd $DOCKER_TESTS && ./subscribe_notify_one_test_slave_starter.sh $RELIABILITY_TYPE $CLIENT_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; ./subscribe_notify_one_test_slave_starter.sh $RELIABILITY_TYPE $CLIENT_JSON_FILE\" >> $WS_ROOT/slave_test_output 2>&1" & + else cat <<End-of-message ******************************************************************************* diff --git a/test/subscribe_notify_one_tests/subscribe_notify_one_test_slave_starter.sh b/test/subscribe_notify_one_tests/subscribe_notify_one_test_slave_starter.sh index e41852c..830484d 100755 --- a/test/subscribe_notify_one_tests/subscribe_notify_one_test_slave_starter.sh +++ b/test/subscribe_notify_one_tests/subscribe_notify_one_test_slave_starter.sh @@ -31,6 +31,8 @@ export VSOMEIP_APPLICATION_NAME=subscribe_notify_one_test_service_six export VSOMEIP_CONFIGURATION=$2 ./subscribe_notify_one_test_service 6 $1 & +sleep 3 + # Wait until all applications are finished for job in $(jobs -p) do @@ -39,7 +41,7 @@ do wait $job || ((FAIL+=1)) done -# Check if both exited successfully +# Check if both exited successfully if [ $FAIL -eq 0 ] then exit 0 |