Change in docker-playground[master]: Revert "ttcn3-bsc-test: enable A5/4 support in osmo-bsc.cfg"

laforge gerrit-no-reply at lists.osmocom.org
Sun Jul 11 17:41:01 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/24900 )

Change subject: Revert "ttcn3-bsc-test: enable A5/4 support in osmo-bsc.cfg"
......................................................................

Revert "ttcn3-bsc-test: enable A5/4 support in osmo-bsc.cfg"

The test that needs A5/4 enables it dynamically, and a new test requires
a defined value to reset to.
This reverts commit 8005014b55f3c7261731fd8f059ff2be1ea02f9c.

Related: OS#4975
Depends: osmo-ttcn3-hacks I3cf36c6ef86a0db050507f3737f4b0c10dcd52ed
Change-Id: I55135ca00ef51de5cf6eaec75cfc20c21beef665
---
M ttcn3-bsc-test/jenkins-sccplite.sh
M ttcn3-bsc-test/jenkins.sh
M ttcn3-bsc-test/osmo-bsc.cfg
M ttcn3-bsc-test/sccplite/osmo-bsc.cfg
4 files changed, 2 insertions(+), 14 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved; Verified



diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh
index 8c8613a..bc6eaa0 100755
--- a/ttcn3-bsc-test/jenkins-sccplite.sh
+++ b/ttcn3-bsc-test/jenkins-sccplite.sh
@@ -19,12 +19,6 @@
 mkdir $VOL_BASE_DIR/bsc
 cp sccplite/osmo-bsc.cfg $VOL_BASE_DIR/bsc/
 
-# Exclude A5/4 for non-master versions of the IUT
-if ! image_suffix_is_master; then
-	sed "s/encryption a5 0 1 3 4/encryption a5 0 1 3/" \
-		-i $VOL_BASE_DIR/bsc/osmo-bsc.cfg
-fi
-
 SUBNET=12
 network_create $SUBNET
 
diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh
index ef910bd..18236a2 100755
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@@ -22,12 +22,6 @@
 
 mkdir $VOL_BASE_DIR/bts-omldummy
 
-# Exclude A5/4 for non-master versions of the IUT
-if ! image_suffix_is_master; then
-	sed "s/encryption a5 0 1 3 4/encryption a5 0 1 3/" \
-		-i $VOL_BASE_DIR/bsc/osmo-bsc.cfg
-fi
-
 SUBNET=2
 network_create $SUBNET
 
diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg
index 244e205..2044346 100644
--- a/ttcn3-bsc-test/osmo-bsc.cfg
+++ b/ttcn3-bsc-test/osmo-bsc.cfg
@@ -75,7 +75,7 @@
 network
  network country code 1
  mobile network code 1
- encryption a5 0 1 3 4
+ encryption a5 0 1 3
  neci 1
  paging any use tch 0
  handover 1
diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
index 0618e44..564ebce 100644
--- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
+++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg
@@ -64,7 +64,7 @@
 network
  network country code 1
  mobile network code 1
- encryption a5 0 1 3 4
+ encryption a5 0 1 3
  neci 1
  paging any use tch 0
  handover 1

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/24900
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I55135ca00ef51de5cf6eaec75cfc20c21beef665
Gerrit-Change-Number: 24900
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210711/12baafd8/attachment.htm>


More information about the gerrit-log mailing list