diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-07-09 14:05:59 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-07-09 15:10:51 +0200 |
| commit | 688cda11585d50f05102deb5afa23b6b1ca69de7 (patch) | |
| tree | ebd8f5de1fd2c1df4d076ff89f5a9d532c8071d6 /ttcn3-bsc-test | |
| parent | 8005014b55f3c7261731fd8f059ff2be1ea02f9c (diff) | |
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
Diffstat (limited to 'ttcn3-bsc-test')
| -rwxr-xr-x | ttcn3-bsc-test/jenkins-sccplite.sh | 6 | ||||
| -rwxr-xr-x | ttcn3-bsc-test/jenkins.sh | 6 | ||||
| -rw-r--r-- | ttcn3-bsc-test/osmo-bsc.cfg | 2 | ||||
| -rw-r--r-- | ttcn3-bsc-test/sccplite/osmo-bsc.cfg | 2 |
4 files changed, 2 insertions, 14 deletions
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 @@ cp sccplite/BSC_Tests.cfg $VOL_BASE_DIR/bsc-tester/ 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 @@ cp osmo-bsc.cfg $VOL_BASE_DIR/bsc/ 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 @@ cs7 instance 0 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 @@ cs7 instance 0 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 |