osmith has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/37810?usp=email )
Change subject: ttcn3-epdg-test: fix osmo-epdg path for latest
......................................................................
ttcn3-epdg-test: fix osmo-epdg path for latest
Restore the proper path for osmo-epdg when running with -latest, which
has been removed by accident in the earlier commit that should only
have changed the config.
Fix for:
/data/epdg.sh: line 14: /tmp/osmo-epdg/_build/default/bin/osmo-epdg: No such file or
directory
Fixes: 00e68245 ("ttcn3-epdg-test: remove latest code path")
Change-Id: I0547f62a3610a62e90ad767f447c68851e8a725d
---
M ttcn3-epdg-test/epdg.sh
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/ttcn3-epdg-test/epdg.sh b/ttcn3-epdg-test/epdg.sh
index 2614bf9..3de913d 100755
--- a/ttcn3-epdg-test/epdg.sh
+++ b/ttcn3-epdg-test/epdg.sh
@@ -11,7 +11,11 @@
ip addr add $UE_ADDR dev $UE_IFACE
ip link set $UE_IFACE up
ip rule add from $UE_SUBNET table 45
-ERL_FLAGS='-config /data/osmo-epdg.config'
/tmp/osmo-epdg/_build/default/bin/osmo-epdg &
+if [ "$IMAGE_SUFFIX" = "latest" ]; then
+ ERL_FLAGS='-config /data/osmo-epdg.config' /usr/bin/osmo-epdg &
+else
+ ERL_FLAGS='-config /data/osmo-epdg.config'
/tmp/osmo-epdg/_build/default/bin/osmo-epdg &
+fi
MYPID=$!
# We cannot set a route for the interface until it is created by osmo-epdg...
--
To view, visit
https://gerrit.osmocom.org/c/docker-playground/+/37810?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I0547f62a3610a62e90ad767f447c68851e8a725d
Gerrit-Change-Number: 37810
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>