<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/16324">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  neels: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">for sip-latest tests, use MNCC version 5<br><br>osmo-sip-connector master and the ttcn3 tests have moved to protocol version 6.<br>While the extension is gracefully handled by the ttcn templates to make do with<br>both protocol versions, the actual protocol version number sent to<br>osmo-sip-connector breaks the tests if it doesn't match. So that master can<br>still run v6 yet also pass 'latest', configure v5 when the version is not<br>'master'.<br><br>When 'latest' also moves to v6, we of course can revert this again.<br><br>Related: Iaca9ed6611fc5ca8ca749bbbefc31f54bea5e925 (osmo-sip-connector)<br>Related: I39d55432776926a385e1b85b21bcdea8180a8946 (osmo-ttcn3-hacks)<br>Change-Id: I2174e90bdea32f06cd3e8298696b93027e7906bc<br>---<br>M ttcn3-sip-test/SIP_Tests.cfg<br>M ttcn3-sip-test/jenkins.sh<br>2 files changed, 5 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-sip-test/SIP_Tests.cfg b/ttcn3-sip-test/SIP_Tests.cfg</span><br><span>index 2904e76..1ced5c3 100644</span><br><span>--- a/ttcn3-sip-test/SIP_Tests.cfg</span><br><span>+++ b/ttcn3-sip-test/SIP_Tests.cfg</span><br><span>@@ -13,6 +13,7 @@</span><br><span> SIP_Tests.mp_local_host := "172.18.11.103"</span><br><span> SIP_Tests.mp_osmosip_host := "172.18.11.10"</span><br><span> SIP_Tests.mp_mncc := "/data/unix/mncc"</span><br><span style="color: hsl(120, 100%, 40%);">+MNCC_Emulation.mp_mncc_version := 6</span><br><span> </span><br><span> [MAIN_CONTROLLER]</span><br><span> </span><br><span>diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh</span><br><span>index 0bc0357..3d7d523 100755</span><br><span>--- a/ttcn3-sip-test/jenkins.sh</span><br><span>+++ b/ttcn3-sip-test/jenkins.sh</span><br><span>@@ -14,6 +14,10 @@</span><br><span> mkdir $VOL_BASE_DIR/sip-tester/unix</span><br><span> cp SIP_Tests.cfg $VOL_BASE_DIR/sip-tester/</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if [ "x${IMAGE_SUFFIX}" != "xmaster" ]; then</span><br><span style="color: hsl(120, 100%, 40%);">+  sed -i 's/mp_mncc_version := [0-9]*/mp_mncc_version:= 5/' "$VOL_BASE_DIR/sip-tester/SIP_Tests.cfg"</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> mkdir $VOL_BASE_DIR/sip</span><br><span> mkdir $VOL_BASE_DIR/sip/unix</span><br><span> cp osmo-sip-connector.cfg $VOL_BASE_DIR/sip/</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/16324">change 16324</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/+/16324"/><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: I2174e90bdea32f06cd3e8298696b93027e7906bc </div>
<div style="display:none"> Gerrit-Change-Number: 16324 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>