aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xttcn3-bsc-test/jenkins-sccplite.sh6
-rwxr-xr-xttcn3-bsc-test/jenkins.sh6
-rw-r--r--ttcn3-bsc-test/osmo-bsc.cfg2
-rw-r--r--ttcn3-bsc-test/sccplite/osmo-bsc.cfg2
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