<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/17320">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-gsm-tester: Improvements anv fixes to run 4G network with latest ogt version<br><br>* Fix wrong KI.<br>* Add an extra IP address to slave so that ENB and EPC can be run on<br>  different IP addresses and their GTP ports don't collide.<br>* Add required rf parameters to resources.conf<br><br>Change-Id: I0198bc99f75e9567ee717aa79e434ec28705fac9<br>---<br>M osmo-gsm-tester/Dockerfile<br>M osmo-gsm-tester/jenkins.sh<br>R osmo-gsm-tester/osmo-gsm-tester-master.sh<br>A osmo-gsm-tester/osmo-gsm-tester-slave.sh<br>M osmo-gsm-tester/resources.conf<br>5 files changed, 14 insertions(+), 5 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/20/17320/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-gsm-tester/Dockerfile b/osmo-gsm-tester/Dockerfile</span><br><span>index 6ed992e..859f0b1 100644</span><br><span>--- a/osmo-gsm-tester/Dockerfile</span><br><span>+++ b/osmo-gsm-tester/Dockerfile</span><br><span>@@ -134,6 +134,6 @@</span><br><span> ENV   OSMO_GSM_TESTER_CONF /tmp/osmo-gsm-tester/example</span><br><span> </span><br><span> WORKDIR     /data</span><br><span style="color: hsl(0, 100%, 40%);">-CMD        ["/bin/sh", "-c", "/data/osmo-gsm-tester.sh >/data/osmo-gsm-tester.log 2>&1"]</span><br><span style="color: hsl(120, 100%, 40%);">+CMD      ["/bin/sh", "-c", "/data/osmo-gsm-tester-master.sh >/data/osmo-gsm-tester.log 2>&1"]</span><br><span> </span><br><span> EXPOSE      22/tcp</span><br><span>diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh</span><br><span>index 16552f9..248a10b 100755</span><br><span>--- a/osmo-gsm-tester/jenkins.sh</span><br><span>+++ b/osmo-gsm-tester/jenkins.sh</span><br><span>@@ -21,9 +21,10 @@</span><br><span> network_create 172.18.50.0/24</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/ogt-slave</span><br><span style="color: hsl(120, 100%, 40%);">+cp osmo-gsm-tester-slave.sh $VOL_BASE_DIR/ogt-slave/</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/ogt-master</span><br><span style="color: hsl(0, 100%, 40%);">-cp osmo-gsm-tester.sh $VOL_BASE_DIR/ogt-master/</span><br><span style="color: hsl(120, 100%, 40%);">+cp osmo-gsm-tester-master.sh $VOL_BASE_DIR/ogt-master/</span><br><span> </span><br><span> echo Starting container with osmo-gsm-tester slave</span><br><span> docker run       --rm \</span><br><span>@@ -35,7 +36,7 @@</span><br><span>           -v $VOL_BASE_DIR/ogt-slave:/data \</span><br><span>           --name ${BUILD_TAG}-ogt-slave -d \</span><br><span>           $REPO_USER/osmo-gsm-tester \</span><br><span style="color: hsl(0, 100%, 40%);">-            /bin/sh -c "/usr/sbin/sshd -D -e >/data/sshd.log 2>&1"</span><br><span style="color: hsl(120, 100%, 40%);">+            /bin/sh -c "/data/osmo-gsm-tester-slave.sh >/data/sshd.log 2>&1"</span><br><span> </span><br><span> echo Starting container with osmo-gsm-tester main unit</span><br><span> docker run        --rm \</span><br><span>diff --git a/osmo-gsm-tester/osmo-gsm-tester.sh b/osmo-gsm-tester/osmo-gsm-tester-master.sh</span><br><span>similarity index 100%</span><br><span>rename from osmo-gsm-tester/osmo-gsm-tester.sh</span><br><span>rename to osmo-gsm-tester/osmo-gsm-tester-master.sh</span><br><span>diff --git a/osmo-gsm-tester/osmo-gsm-tester-slave.sh b/osmo-gsm-tester/osmo-gsm-tester-slave.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..3170922</span><br><span>--- /dev/null</span><br><span>+++ b/osmo-gsm-tester/osmo-gsm-tester-slave.sh</span><br><span>@@ -0,0 +1,6 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/bash</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Add local IP addresses required by osmo-gsm-tester resources:</span><br><span style="color: hsl(120, 100%, 40%);">+ip addr add 172.18.50.101/24 dev eth0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/usr/sbin/sshd -D -e</span><br><span>diff --git a/osmo-gsm-tester/resources.conf b/osmo-gsm-tester/resources.conf</span><br><span>index 1120178..a81d92a 100644</span><br><span>--- a/osmo-gsm-tester/resources.conf</span><br><span>+++ b/osmo-gsm-tester/resources.conf</span><br><span>@@ -36,8 +36,9 @@</span><br><span> enb:</span><br><span> - label: srsENB-zmq</span><br><span>   type: srsenb</span><br><span style="color: hsl(120, 100%, 40%);">+  rf_dev_type: zmq</span><br><span>   remote_user: jenkins</span><br><span style="color: hsl(0, 100%, 40%);">-  addr: 172.18.50.100</span><br><span style="color: hsl(120, 100%, 40%);">+  addr: 172.18.50.101</span><br><span> </span><br><span> arfcn:</span><br><span>   - arfcn: 512</span><br><span>@@ -53,8 +54,9 @@</span><br><span> </span><br><span> - label: srsUE-zmq_1</span><br><span>   type: srsue</span><br><span style="color: hsl(120, 100%, 40%);">+  rf_dev_type: zmq</span><br><span>   remote_user: jenkins</span><br><span>   addr: 172.18.50.100</span><br><span>   imsi: '001010123456789'</span><br><span style="color: hsl(0, 100%, 40%);">-  ki: '8CCBE85A62C6DC7AC2A9886F4BBC3146'</span><br><span style="color: hsl(120, 100%, 40%);">+  ki: '00112233445566778899aabbccddeeff'</span><br><span>   auth_algo: 'xor'</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/17320">change 17320</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/c/docker-playground/+/17320"/><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-Change-Id: I0198bc99f75e9567ee717aa79e434ec28705fac9 </div>
<div style="display:none"> Gerrit-Change-Number: 17320 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>