<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12694">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ttcn3-*-test: don't hardcode /usr/local/bin/<br><br>Remove hardcoded /usr/local/bin/osmo-* run commands from jenkins.sh.<br>This caused the *-latest tests to fail, as they have the Osmocom<br>binaries in /usr/bin instead of /usr/local/bin.<br><br>Adjust Dockerfiles where the default run command was different from the<br>hardcoded run command in jenkins.sh (e.g. missing config file<br>parameters).<br><br>Related: OS#367<br>Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666<br>---<br>M osmo-bsc-master/Dockerfile<br>M osmo-sip-latest/Dockerfile<br>M osmo-sip-master/Dockerfile<br>M ttcn3-bscnat-test/jenkins.sh<br>M ttcn3-bts-test/jenkins.sh<br>M ttcn3-hlr-test/jenkins.sh<br>M ttcn3-msc-test/jenkins.sh<br>M ttcn3-sgsn-test/jenkins.sh<br>M ttcn3-sip-test/jenkins.sh<br>9 files changed, 11 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/12694/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile</span><br><span>index 5c76688..7afab23 100644</span><br><span>--- a/osmo-bsc-master/Dockerfile</span><br><span>+++ b/osmo-bsc-master/Dockerfile</span><br><span>@@ -42,6 +42,6 @@</span><br><span> COPY osmo-bsc.cfg /data/osmo-bsc.cfg</span><br><span> </span><br><span> WORKDIR /data</span><br><span style="color: hsl(0, 100%, 40%);">-CMD ["/usr/local/bin/osmo-bsc"]</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ["/usr/local/bin/osmo-bsc", "-c", "/data/osmo-bsc.cfg"]</span><br><span> </span><br><span> #EXPOSE </span><br><span>diff --git a/osmo-sip-latest/Dockerfile b/osmo-sip-latest/Dockerfile</span><br><span>index a468c9f..bce5566 100644</span><br><span>--- a/osmo-sip-latest/Dockerfile</span><br><span>+++ b/osmo-sip-latest/Dockerfile</span><br><span>@@ -27,6 +27,6 @@</span><br><span> COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg</span><br><span> </span><br><span> WORKDIR /data</span><br><span style="color: hsl(0, 100%, 40%);">-CMD ["/usr/bin/osmo-sip-connector"]</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ["/usr/bin/osmo-sip-connector", "-M", "/data/unix/mncc"]</span><br><span> </span><br><span> #EXPOSE </span><br><span>diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile</span><br><span>index e69cbc7..6adab56 100644</span><br><span>--- a/osmo-sip-master/Dockerfile</span><br><span>+++ b/osmo-sip-master/Dockerfile</span><br><span>@@ -46,6 +46,6 @@</span><br><span> COPY osmo-sip-connector.cfg /data/osmo-sip-connector.cfg</span><br><span> </span><br><span> WORKDIR /data</span><br><span style="color: hsl(0, 100%, 40%);">-CMD ["/usr/local/bin/osmo-sip-connector"]</span><br><span style="color: hsl(120, 100%, 40%);">+CMD ["/usr/local/bin/osmo-sip-connector", "-M", "/data/unix/mncc"]</span><br><span> </span><br><span> #EXPOSE </span><br><span>diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh</span><br><span>index 0287097..df45b0a 100755</span><br><span>--- a/ttcn3-bscnat-test/jenkins.sh</span><br><span>+++ b/ttcn3-bscnat-test/jenkins.sh</span><br><span>@@ -23,7 +23,7 @@</span><br><span> --network $NET_NAME --ip 172.18.11.20 \</span><br><span> -v $VOL_BASE_DIR/bscnat:/data \</span><br><span> --name ${BUILD_TAG}-bscnat -d \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-nitb-$IMAGE_SUFFIX /usr/local/bin/osmo-bsc_nat -c /data/osmo-bsc-nat.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-nitb-$IMAGE_SUFFIX osmo-bsc_nat -c /data/osmo-bsc-nat.cfg</span><br><span> </span><br><span> echo Starting container with BSCNAT testsuite</span><br><span> docker run --rm \</span><br><span>diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh</span><br><span>index 96616d9..4cca7cb 100755</span><br><span>--- a/ttcn3-bts-test/jenkins.sh</span><br><span>+++ b/ttcn3-bts-test/jenkins.sh</span><br><span>@@ -33,8 +33,7 @@</span><br><span> --network $NET_NAME --ip 172.18.9.11 \</span><br><span> -v $VOL_BASE_DIR/bsc:/data \</span><br><span> --name ${BUILD_TAG}-bsc -d \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-bsc-$IMAGE_SUFFIX \</span><br><span style="color: hsl(0, 100%, 40%);">- /usr/local/bin/osmo-bsc -c /data/osmo-bsc.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-bsc-$IMAGE_SUFFIX</span><br><span> </span><br><span> echo Starting container with BTS</span><br><span> docker run --rm \</span><br><span>@@ -43,7 +42,7 @@</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-bts -d \</span><br><span> $REPO_USER/osmo-bts-$IMAGE_SUFFIX \</span><br><span style="color: hsl(0, 100%, 40%);">- /usr/local/bin/respawn.sh /usr/local/bin/osmo-bts-trx -c /data/osmo-bts.cfg -i 172.18.9.10</span><br><span style="color: hsl(120, 100%, 40%);">+ /usr/local/bin/respawn.sh osmo-bts-trx -c /data/osmo-bts.cfg -i 172.18.9.10</span><br><span> </span><br><span> echo Starting container with fake_trx</span><br><span> docker run --rm \</span><br><span>@@ -63,7 +62,7 @@</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-trxcon -d \</span><br><span> $REPO_USER/osmocom-bb-host-master \</span><br><span style="color: hsl(0, 100%, 40%);">- /usr/local/bin/trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2</span><br><span style="color: hsl(120, 100%, 40%);">+ trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2</span><br><span> </span><br><span> </span><br><span> echo Starting container with BTS testsuite</span><br><span>diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh</span><br><span>index 89669eb..512dd2c 100755</span><br><span>--- a/ttcn3-hlr-test/jenkins.sh</span><br><span>+++ b/ttcn3-hlr-test/jenkins.sh</span><br><span>@@ -21,8 +21,7 @@</span><br><span> --network $NET_NAME --ip 172.18.10.20 \</span><br><span> -v $VOL_BASE_DIR/hlr:/data \</span><br><span> --name ${BUILD_TAG}-hlr -d \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-hlr-$IMAGE_SUFFIX \</span><br><span style="color: hsl(0, 100%, 40%);">- /usr/local/bin/osmo-hlr</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-hlr-$IMAGE_SUFFIX</span><br><span> </span><br><span> echo Starting container with HLR testsuite</span><br><span> docker run --rm \</span><br><span>diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh</span><br><span>index 82ec483..975b068 100755</span><br><span>--- a/ttcn3-msc-test/jenkins.sh</span><br><span>+++ b/ttcn3-msc-test/jenkins.sh</span><br><span>@@ -37,8 +37,7 @@</span><br><span> -v $VOL_BASE_DIR/msc:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-msc -d \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-msc-$IMAGE_SUFFIX \</span><br><span style="color: hsl(0, 100%, 40%);">- /usr/local/bin/osmo-msc</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-msc-$IMAGE_SUFFIX</span><br><span> </span><br><span> echo Starting container with MSC testsuite</span><br><span> docker run --rm \</span><br><span>diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh</span><br><span>index 9243e2b..96f148a 100755</span><br><span>--- a/ttcn3-sgsn-test/jenkins.sh</span><br><span>+++ b/ttcn3-sgsn-test/jenkins.sh</span><br><span>@@ -23,8 +23,7 @@</span><br><span> --network $NET_NAME --ip 172.18.8.10 \</span><br><span> -v $VOL_BASE_DIR/sgsn:/data \</span><br><span> --name ${BUILD_TAG}-sgsn -d \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX \</span><br><span style="color: hsl(0, 100%, 40%);">- /usr/local/bin/osmo-sgsn</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-sgsn-$IMAGE_SUFFIX</span><br><span> </span><br><span> echo Starting container with SGSN testsuite</span><br><span> docker run --rm \</span><br><span>diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh</span><br><span>index 2dfd281..317482d 100755</span><br><span>--- a/ttcn3-sip-test/jenkins.sh</span><br><span>+++ b/ttcn3-sip-test/jenkins.sh</span><br><span>@@ -26,8 +26,7 @@</span><br><span> -v $VOL_BASE_DIR/sip:/data \</span><br><span> -v $VOL_BASE_DIR/unix:/data/unix \</span><br><span> --name ${BUILD_TAG}-sip-connector -d \</span><br><span style="color: hsl(0, 100%, 40%);">- $REPO_USER/osmo-sip-$IMAGE_SUFFIX \</span><br><span style="color: hsl(0, 100%, 40%);">- /usr/local/bin/osmo-sip-connector -M /data/unix/mncc</span><br><span style="color: hsl(120, 100%, 40%);">+ $REPO_USER/osmo-sip-$IMAGE_SUFFIX</span><br><span> </span><br><span> echo Starting container with SIP testsuite</span><br><span> docker run --rm \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12694">change 12694</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12694"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I9d1427e66028ffd15fed211b2dab5adc37718666 </div>
<div style="display:none"> Gerrit-Change-Number: 12694 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>