<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/18104">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: Pass conf dir through -c cmd line arg instead of env var<br><br>As of osmo-gsm-tester.git Change-Id<br>I7eb69f870d0dcb5906d45ae067d6bed1aabf5862, the enviornment variable<br>OSMO_GSM_TESTER_CONF is deprecated in favour of already existing -c cmd<br>line argument. Let's use it while still providing the docker setup with<br>a way (using same env var name) to modify where the conf dir is to be<br>found inside the docker container (for instance, to provide an external<br>conf dir).<br><br>Change-Id: I54ea9dc4d0bb205debf312f5a37053bc60cfcdb7<br>---<br>M osmo-gsm-tester/Dockerfile<br>M osmo-gsm-tester/jenkins.sh<br>M osmo-gsm-tester/osmo-gsm-tester-master.sh<br>3 files changed, 3 insertions(+), 3 deletions(-)<br><br></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 b46fe4c..0473f96 100644</span><br><span>--- a/osmo-gsm-tester/Dockerfile</span><br><span>+++ b/osmo-gsm-tester/Dockerfile</span><br><span>@@ -132,8 +132,6 @@</span><br><span> VOLUME   /data</span><br><span> COPY   resources.conf /tmp/osmo-gsm-tester/sysmocom/resources.conf</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ENV   OSMO_GSM_TESTER_CONF /tmp/osmo-gsm-tester/sysmocom</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> WORKDIR      /data</span><br><span> CMD    ["/bin/sh", "-c", "/data/osmo-gsm-tester-master.sh >/data/osmo-gsm-tester.log 2>&1"]</span><br><span> </span><br><span>diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh</span><br><span>index 71ab0f4..89f7116 100755</span><br><span>--- a/osmo-gsm-tester/jenkins.sh</span><br><span>+++ b/osmo-gsm-tester/jenkins.sh</span><br><span>@@ -80,6 +80,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_CONF=${OSMO_GSM_TESTER_CONF:-/tmp/osmo-gsm-tester/sysmocom}</span><br><span> 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>@@ -90,6 +91,7 @@</span><br><span>            --ip 172.18.50.2 \</span><br><span>           -v $VOL_BASE_DIR/ogt-master:/data \</span><br><span>          -v "${TRIAL_DIR}:/tmp/trial" \</span><br><span style="color: hsl(120, 100%, 40%);">+              -e "OSMO_GSM_TESTER_CONF=${OSMO_GSM_TESTER_CONF}" \</span><br><span>                -e "OSMO_GSM_TESTER_OPTS=${OSMO_GSM_TESTER_OPTS}" \</span><br><span>                -e "SRS_LTE_REPO_NAME=${SRS_LTE_REPO_NAME}" \</span><br><span>              -e "HOST_USER_ID=$(id -u)" \</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 059fae7..4a32376 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>@@ -43,7 +43,7 @@</span><br><span> chown -R jenkins /tmp/trial/</span><br><span> </span><br><span> rc=0</span><br><span style="color: hsl(0, 100%, 40%);">-su -c "python3 -u /tmp/osmo-gsm-tester/src/osmo-gsm-tester.py /tmp/trial $OSMO_GSM_TESTER_OPTS" -m jenkins || rc=$?</span><br><span style="color: hsl(120, 100%, 40%);">+su -c "python3 -u /tmp/osmo-gsm-tester/src/osmo-gsm-tester.py -c \"$OSMO_GSM_TESTER_CONF\" /tmp/trial $OSMO_GSM_TESTER_OPTS" -m jenkins || rc=$?</span><br><span> </span><br><span> # Make trial dir again owned by user running the container:</span><br><span> chown -R "${HOST_USER_ID}:${HOST_GROUP_ID}" /tmp/trial/</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/18104">change 18104</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/+/18104"/><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: I54ea9dc4d0bb205debf312f5a37053bc60cfcdb7 </div>
<div style="display:none"> Gerrit-Change-Number: 18104 </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-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>