osmith submitted this change.
Revert "ttcn3-bts-test: do not use respawn.sh"
This reverts commit 57f680439f378f5bb5c6582297ae0636db6650f8.
We're observing a lot of turbulence in ttcn3-bts-test due to the
clock instability:
Shutting down BTS, exit 1, reason: PC clock skew too high
Even though it's no longer necessary to respawn osmo-bts-trx,
let's restore the respawn.sh to recover from such failures.
Related: OS#6794
Change-Id: I1177e9068c49bf31a4010cd21700839dfa8d5050
---
M ttcn3-bts-test/jenkins.sh
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index edb7030..5d5629d 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -44,6 +44,7 @@
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
@@ -56,10 +57,11 @@
--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 \
- /bin/sh -c "osmo-bts-$variant -c /data/osmo-bts.gen.cfg >>/data/osmo-bts.log 2>&1"
+ /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-$variant -c /data/osmo-bts.gen.cfg >>/data/osmo-bts.log 2>&1"
}
start_fake_trx() {
To view, visit change 40783. To unsubscribe, or for help writing mail filters, visit settings.