<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/17463">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-gsm-tester: Allow passing osmo-gsm-tester params from jenkins.sh caller<br><br>After this patch, one can run osmo-gsm-tester with specific parameters<br>(debug level, suite and tests to run, etc.) by using<br>OSMO_GSM_TESTER_OPTS variable:<br>OSMO_GSM_TESTER_OPTS="-s 4g -t ping -l error" ./jenkins.sh<br><br>Change-Id: I2e8ff51a3152125148c6a117a987e8c11a576e1e<br>---<br>M osmo-gsm-tester/jenkins.sh<br>M osmo-gsm-tester/osmo-gsm-tester-master.sh<br>2 files changed, 10 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh</span><br><span>index 71a2ee3..c114222 100755</span><br><span>--- a/osmo-gsm-tester/jenkins.sh</span><br><span>+++ b/osmo-gsm-tester/jenkins.sh</span><br><span>@@ -7,10 +7,12 @@</span><br><span> # Trial directory must be set in the parent host's /tmp/trial path, which will</span><br><span> # then be mounted to ogt-master and used my osmo-gsm-tester.</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# osmo-gsm-tester parameters and suites are passed in osmo-gsm-tester.sh in same</span><br><span style="color: hsl(0, 100%, 40%);">-# directory as this script.</span><br><span style="color: hsl(120, 100%, 40%);">+# osmo-gsm-tester parameters and suites are passed to osmo-gsm-tester.sh in same</span><br><span style="color: hsl(120, 100%, 40%);">+# directory as this script using environment variable OSMO_GSM_TESTER_OPTS.</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# Log files can be found in host's /tmp/logs/ directory.</span><br><span style="color: hsl(120, 100%, 40%);">+# Log files can be found in host's /tmp/logs/ directory. Results generated by</span><br><span style="color: hsl(120, 100%, 40%);">+# osmo-gsm-tester last run can be found as usual under the trial directory</span><br><span style="color: hsl(120, 100%, 40%);">+# (/tmp/trial/last_run).</span><br><span> </span><br><span> . ../jenkins-common.sh</span><br><span> IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"</span><br><span>@@ -40,6 +42,7 @@</span><br><span> /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 style="color: hsl(120, 100%, 40%);">+OSMO_GSM_TESTER_OPTS=${OSMO_GSM_TESTER_OPTS:--T -l dbg -s 4g:srsenb-rftype@zmq+srsue-rftype@zmq -t ping}</span><br><span> docker run --rm \</span><br><span> --cap-add=NET_ADMIN \</span><br><span> --cap-add=SYS_ADMIN \</span><br><span>@@ -49,6 +52,7 @@</span><br><span> --ip 172.18.50.2 \</span><br><span> -v $VOL_BASE_DIR/ogt-master:/data \</span><br><span> -v /tmp/trial:/tmp/trial \</span><br><span style="color: hsl(120, 100%, 40%);">+ -e "OSMO_GSM_TESTER_OPTS=${OSMO_GSM_TESTER_OPTS}" \</span><br><span> --name ${BUILD_TAG}-ogt-master \</span><br><span> $REPO_USER/osmo-gsm-tester</span><br><span> </span><br><span>diff --git a/osmo-gsm-tester/osmo-gsm-tester-master.sh b/osmo-gsm-tester/osmo-gsm-tester-master.sh</span><br><span>index bfd303b..975e4e5 100755</span><br><span>--- a/osmo-gsm-tester/osmo-gsm-tester-master.sh</span><br><span>+++ b/osmo-gsm-tester/osmo-gsm-tester-master.sh</span><br><span>@@ -1,7 +1,7 @@</span><br><span> #!/bin/bash</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+set -x -e</span><br><span> # Add local IP addresses required by osmo-gsm-tester resources:</span><br><span style="color: hsl(0, 100%, 40%);">-ip addr add 172.18.50.2/24 dev eth0</span><br><span style="color: hsl(120, 100%, 40%);">+ip addr add 172.18.50.2/24 dev eth0 || true #already set by docker run --ip cmd</span><br><span> ip addr add 172.18.50.3/24 dev eth0</span><br><span> ip addr add 172.18.50.4/24 dev eth0</span><br><span> ip addr add 172.18.50.5/24 dev eth0</span><br><span>@@ -11,4 +11,4 @@</span><br><span> ip addr add 172.18.50.9/24 dev eth0</span><br><span> ip addr add 172.18.50.10/24 dev eth0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-su -c "python3 -u /tmp/osmo-gsm-tester/src/osmo-gsm-tester.py /tmp/trial -T -l dbg -s 4g -t iperf3" -m jenkins</span><br><span style="color: hsl(120, 100%, 40%);">+su -c "python3 -u /tmp/osmo-gsm-tester/src/osmo-gsm-tester.py /tmp/trial $OSMO_GSM_TESTER_OPTS" -m jenkins</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/17463">change 17463</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/+/17463"/><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: I2e8ff51a3152125148c6a117a987e8c11a576e1e </div>
<div style="display:none"> Gerrit-Change-Number: 17463 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>