Change in docker-playground[master]: ttcn3-*-test: don't hardcode /usr/local/bin/

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

osmith gerrit-no-reply at lists.osmocom.org
Tue Jan 29 12:25:12 UTC 2019 

osmith has submitted this change and it was merged. ( https://gerrit.osmocom.org/12694 )

Change subject: ttcn3-*-test: don't hardcode /usr/local/bin/
......................................................................

ttcn3-*-test: don't hardcode /usr/local/bin/

Remove hardcoded /usr/local/bin/ paths from jenkins.sh. This caused the
*-latest tests to fail, as they have the Osmocom binaries in /usr/bin
instead of /usr/local/bin.

Related: OS#3767
Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666
---
M ttcn3-bscnat-test/jenkins.sh
M ttcn3-bts-test/jenkins.sh
M ttcn3-hlr-test/jenkins.sh
M ttcn3-msc-test/jenkins.sh
M ttcn3-sgsn-test/jenkins.sh
M ttcn3-sip-test/jenkins.sh
6 files changed, 8 insertions(+), 8 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Neels Hofmeyr: Looks good to me, approved
  osmith: Verified



diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh
index 0287097..df45b0a 100755
--- a/ttcn3-bscnat-test/jenkins.sh
+++ b/ttcn3-bscnat-test/jenkins.sh
@@ -23,7 +23,7 @@
 		--network $NET_NAME --ip 172.18.11.20 \
 		-v $VOL_BASE_DIR/bscnat:/data \
 		--name ${BUILD_TAG}-bscnat -d \
-		$REPO_USER/osmo-nitb-$IMAGE_SUFFIX /usr/local/bin/osmo-bsc_nat -c /data/osmo-bsc-nat.cfg
+		$REPO_USER/osmo-nitb-$IMAGE_SUFFIX osmo-bsc_nat -c /data/osmo-bsc-nat.cfg
 
 echo Starting container with BSCNAT testsuite
 docker run	--rm \
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 96616d9..b287a78 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -34,7 +34,7 @@
 		-v $VOL_BASE_DIR/bsc:/data \
 		--name ${BUILD_TAG}-bsc -d \
 		$REPO_USER/osmo-bsc-$IMAGE_SUFFIX \
-		/usr/local/bin/osmo-bsc -c /data/osmo-bsc.cfg
+		osmo-bsc -c /data/osmo-bsc.cfg
 
 echo Starting container with BTS
 docker run	--rm \
@@ -43,7 +43,7 @@
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-bts -d \
 		$REPO_USER/osmo-bts-$IMAGE_SUFFIX \
-		/usr/local/bin/respawn.sh /usr/local/bin/osmo-bts-trx -c /data/osmo-bts.cfg -i 172.18.9.10
+		/usr/local/bin/respawn.sh osmo-bts-trx -c /data/osmo-bts.cfg -i 172.18.9.10
 
 echo Starting container with fake_trx
 docker run	--rm \
@@ -63,7 +63,7 @@
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-trxcon -d \
 		$REPO_USER/osmocom-bb-host-master \
-		/usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2
+		trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2
 
 
 echo Starting container with BTS testsuite
diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh
index 89669eb..fcb51b6 100755
--- a/ttcn3-hlr-test/jenkins.sh
+++ b/ttcn3-hlr-test/jenkins.sh
@@ -22,7 +22,7 @@
 		-v $VOL_BASE_DIR/hlr:/data \
 		--name ${BUILD_TAG}-hlr -d \
 		$REPO_USER/osmo-hlr-$IMAGE_SUFFIX \
-		/usr/local/bin/osmo-hlr
+		osmo-hlr
 
 echo Starting container with HLR testsuite
 docker run	--rm \
diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh
index 82ec483..3289a67 100755
--- a/ttcn3-msc-test/jenkins.sh
+++ b/ttcn3-msc-test/jenkins.sh
@@ -38,7 +38,7 @@
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-msc -d \
 		$REPO_USER/osmo-msc-$IMAGE_SUFFIX \
-		/usr/local/bin/osmo-msc
+		osmo-msc
 
 echo Starting container with MSC testsuite
 docker run	--rm \
diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh
index 9243e2b..e4611bc 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -24,7 +24,7 @@
 		-v $VOL_BASE_DIR/sgsn:/data \
 		--name ${BUILD_TAG}-sgsn -d \
 		$REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \
-		/usr/local/bin/osmo-sgsn
+		osmo-sgsn
 
 echo Starting container with SGSN testsuite
 docker run	--rm \
diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh
index 2dfd281..f70943c 100755
--- a/ttcn3-sip-test/jenkins.sh
+++ b/ttcn3-sip-test/jenkins.sh
@@ -27,7 +27,7 @@
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-sip-connector -d \
 		$REPO_USER/osmo-sip-$IMAGE_SUFFIX \
-		/usr/local/bin/osmo-sip-connector -M /data/unix/mncc
+		osmo-sip-connector -M /data/unix/mncc
 
 echo Starting container with SIP testsuite
 docker run	--rm \

-- 
To view, visit https://gerrit.osmocom.org/12694
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666
Gerrit-Change-Number: 12694
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-CC: Harald Welte <laforge at gnumonks.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190129/9287238a/attachment.htm>

More information about the gerrit-log mailing list