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
Fri Jan 25 12:33:43 UTC 2019 

osmith has uploaded this change for review. ( 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/osmo-* run commands from jenkins.sh.
This caused the *-latest tests to fail, as they have the Osmocom
binaries in /usr/bin instead of /usr/local/bin.

Adjust Dockerfiles where the default run command was different from the
hardcoded run command in jenkins.sh (e.g. missing config file
parameters).

Related: OS#367
Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666
---
M osmo-bsc-master/Dockerfile
M osmo-sip-latest/Dockerfile
M osmo-sip-master/Dockerfile
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
9 files changed, 11 insertions(+), 16 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/12694/1

diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile
index 5c76688..7afab23 100644
--- a/osmo-bsc-master/Dockerfile
+++ b/osmo-bsc-master/Dockerfile
@@ -42,6 +42,6 @@
 COPY	osmo-bsc.cfg /data/osmo-bsc.cfg
 
 WORKDIR	/data
-CMD	["/usr/local/bin/osmo-bsc"]
+CMD	["/usr/local/bin/osmo-bsc", "-c", "/data/osmo-bsc.cfg"]
 
 #EXPOSE	
diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile
index a468c9f..bce5566 100644
--- a/osmo-sip-latest/Dockerfile
+++ b/osmo-sip-latest/Dockerfile
@@ -27,6 +27,6 @@
 COPY	osmo-sip-connector.cfg /data/osmo-sip-connector.cfg
 
 WORKDIR	/data
-CMD	["/usr/bin/osmo-sip-connector"]
+CMD	["/usr/bin/osmo-sip-connector", "-M", "/data/unix/mncc"]
 
 #EXPOSE	
diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile
index e69cbc7..6adab56 100644
--- a/osmo-sip-master/Dockerfile
+++ b/osmo-sip-master/Dockerfile
@@ -46,6 +46,6 @@
 COPY	osmo-sip-connector.cfg /data/osmo-sip-connector.cfg
 
 WORKDIR	/data
-CMD	["/usr/local/bin/osmo-sip-connector"]
+CMD	["/usr/local/bin/osmo-sip-connector", "-M", "/data/unix/mncc"]
 
 #EXPOSE	
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..4cca7cb 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -33,8 +33,7 @@
 		--network $NET_NAME --ip 172.18.9.11 \
 		-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
+		$REPO_USER/osmo-bsc-$IMAGE_SUFFIX
 
 echo Starting container with BTS
 docker run	--rm \
@@ -43,7 +42,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 +62,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..512dd2c 100755
--- a/ttcn3-hlr-test/jenkins.sh
+++ b/ttcn3-hlr-test/jenkins.sh
@@ -21,8 +21,7 @@
 		--network $NET_NAME --ip 172.18.10.20 \
 		-v $VOL_BASE_DIR/hlr:/data \
 		--name ${BUILD_TAG}-hlr -d \
-		$REPO_USER/osmo-hlr-$IMAGE_SUFFIX \
-		/usr/local/bin/osmo-hlr
+		$REPO_USER/osmo-hlr-$IMAGE_SUFFIX
 
 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..975b068 100755
--- a/ttcn3-msc-test/jenkins.sh
+++ b/ttcn3-msc-test/jenkins.sh
@@ -37,8 +37,7 @@
 		-v $VOL_BASE_DIR/msc:/data \
 		-v $VOL_BASE_DIR/unix:/data/unix \
 		--name ${BUILD_TAG}-msc -d \
-		$REPO_USER/osmo-msc-$IMAGE_SUFFIX \
-		/usr/local/bin/osmo-msc
+		$REPO_USER/osmo-msc-$IMAGE_SUFFIX
 
 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..96f148a 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -23,8 +23,7 @@
 		--network $NET_NAME --ip 172.18.8.10 \
 		-v $VOL_BASE_DIR/sgsn:/data \
 		--name ${BUILD_TAG}-sgsn -d \
-		$REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \
-		/usr/local/bin/osmo-sgsn
+		$REPO_USER/osmo-sgsn-$IMAGE_SUFFIX
 
 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..317482d 100755
--- a/ttcn3-sip-test/jenkins.sh
+++ b/ttcn3-sip-test/jenkins.sh
@@ -26,8 +26,7 @@
 		-v $VOL_BASE_DIR/sip:/data \
 		-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
+		$REPO_USER/osmo-sip-$IMAGE_SUFFIX
 
 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: newchange
Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666
Gerrit-Change-Number: 12694
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190125/46293e3b/attachment.htm>

More information about the gerrit-log mailing list