diff --git a/osmo-bts-master/respawn.sh b/osmo-bts-master/respawn.sh index 24139163..31a8c065 100755 --- a/osmo-bts-master/respawn.sh +++ b/osmo-bts-master/respawn.sh @@ -2,6 +2,8 @@ trap "kill 0" EXIT +SLEEP_BEFORE_RESPAWN=${SLEEP_BEFORE_RESPAWN:-0} + i=0 max_i=500 while [ $i -lt $max_i ]; do @@ -10,6 +12,10 @@ while [ $i -lt $max_i ]; do LAST_PID=$! wait $LAST_PID echo "$i: stopped pid $LAST_PID with status $?" + if [ $SLEEP_BEFORE_RESPAWN -gt 0 ]; then + echo "sleeping $SLEEP_BEFORE_RESPAWN seconds..." + sleep $SLEEP_BEFORE_RESPAWN + fi i=$(expr $i + 1) done echo "exiting after $max_i runs" diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index d85c82f7..c32682cf 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -24,6 +24,7 @@ start_bsc() { start_bts() { local variant variant="$1" + sleep_time_respawn="$2" echo Starting container with BTS if [ -z "$variant" ]; then echo ERROR: You have to specify a BTS variant @@ -34,6 +35,7 @@ start_bts() { --ulimit core=-1 \ -v $VOL_BASE_DIR/bts:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ + -e "SLEEP_BEFORE_RESPAWN=$sleep_time_respawn" \ --name ${BUILD_TAG}-bts -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ @@ -127,7 +129,7 @@ mkdir $VOL_BASE_DIR/virtphy # 1) classic test suite with BSC for OML and trxcon+fake_trx start_bsc -start_bts trx +start_bts trx 0 start_fake_trx start_trxcon start_testsuite @@ -139,7 +141,7 @@ docker container kill ${BUILD_TAG}-trxcon docker container kill ${BUILD_TAG}-fake_trx docker container kill ${BUILD_TAG}-bts cp virtphy/osmo-bts.cfg $VOL_BASE_DIR/bts/ -start_bts virtual +start_bts virtual 0 start_virtphy # ... and execute the testsuite again with different cfg cp virtphy/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester/ @@ -151,7 +153,7 @@ docker container kill ${BUILD_TAG}-bsc docker container kill ${BUILD_TAG}-virtphy docker container kill ${BUILD_TAG}-bts cp oml/osmo-bts.cfg $VOL_BASE_DIR/bts/ -start_bts trx +start_bts trx 1 start_fake_trx start_trxcon # ... and execute the testsuite again with different cfg