<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/24900">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Revert "ttcn3-bsc-test: enable A5/4 support in osmo-bsc.cfg"<br><br>The test that needs A5/4 enables it dynamically, and a new test requires<br>a defined value to reset to.<br>This reverts commit 8005014b55f3c7261731fd8f059ff2be1ea02f9c.<br><br>Related: OS#4975<br>Depends: osmo-ttcn3-hacks I3cf36c6ef86a0db050507f3737f4b0c10dcd52ed<br>Change-Id: I55135ca00ef51de5cf6eaec75cfc20c21beef665<br>---<br>M ttcn3-bsc-test/jenkins-sccplite.sh<br>M ttcn3-bsc-test/jenkins.sh<br>M ttcn3-bsc-test/osmo-bsc.cfg<br>M ttcn3-bsc-test/sccplite/osmo-bsc.cfg<br>4 files changed, 2 insertions(+), 14 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/00/24900/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>index 8c8613a..bc6eaa0 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins-sccplite.sh</span><br><span>@@ -19,12 +19,6 @@</span><br><span> mkdir $VOL_BASE_DIR/bsc</span><br><span> cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Exclude A5/4 for non-master versions of the IUT</span><br><span style="color: hsl(0, 100%, 40%);">-if ! image_suffix_is_master; then</span><br><span style="color: hsl(0, 100%, 40%);">-  sed "s/encryption a5 0 1 3 4/encryption a5 0 1 3/" \</span><br><span style="color: hsl(0, 100%, 40%);">-          -i $VOL_BASE_DIR/bsc/osmo-bsc.cfg</span><br><span style="color: hsl(0, 100%, 40%);">-fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> SUBNET=12</span><br><span> network_create $SUBNET</span><br><span> </span><br><span>diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh</span><br><span>index ef910bd..18236a2 100755</span><br><span>--- a/ttcn3-bsc-test/jenkins.sh</span><br><span>+++ b/ttcn3-bsc-test/jenkins.sh</span><br><span>@@ -22,12 +22,6 @@</span><br><span> </span><br><span> mkdir $VOL_BASE_DIR/bts-omldummy</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Exclude A5/4 for non-master versions of the IUT</span><br><span style="color: hsl(0, 100%, 40%);">-if ! image_suffix_is_master; then</span><br><span style="color: hsl(0, 100%, 40%);">-      sed "s/encryption a5 0 1 3 4/encryption a5 0 1 3/" \</span><br><span style="color: hsl(0, 100%, 40%);">-          -i $VOL_BASE_DIR/bsc/osmo-bsc.cfg</span><br><span style="color: hsl(0, 100%, 40%);">-fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> SUBNET=2</span><br><span> network_create $SUBNET</span><br><span> </span><br><span>diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg</span><br><span>index 244e205..2044346 100644</span><br><span>--- a/ttcn3-bsc-test/osmo-bsc.cfg</span><br><span>+++ b/ttcn3-bsc-test/osmo-bsc.cfg</span><br><span>@@ -75,7 +75,7 @@</span><br><span> network</span><br><span>  network country code 1</span><br><span>  mobile network code 1</span><br><span style="color: hsl(0, 100%, 40%);">- encryption a5 0 1 3 4</span><br><span style="color: hsl(120, 100%, 40%);">+ encryption a5 0 1 3</span><br><span>  neci 1</span><br><span>  paging any use tch 0</span><br><span>  handover 1</span><br><span>diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg</span><br><span>index 0618e44..564ebce 100644</span><br><span>--- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg</span><br><span>+++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg</span><br><span>@@ -64,7 +64,7 @@</span><br><span> network</span><br><span>  network country code 1</span><br><span>  mobile network code 1</span><br><span style="color: hsl(0, 100%, 40%);">- encryption a5 0 1 3 4</span><br><span style="color: hsl(120, 100%, 40%);">+ encryption a5 0 1 3</span><br><span>  neci 1</span><br><span>  paging any use tch 0</span><br><span>  handover 1</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/24900">change 24900</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/+/24900"/><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: I55135ca00ef51de5cf6eaec75cfc20c21beef665 </div>
<div style="display:none"> Gerrit-Change-Number: 24900 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>