From 666488c8e45ead6c336bd0de51b9008013031dce Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Wed, 8 Feb 2023 12:36:27 +0100
Subject: [PATCH] ttcn3-*: Update test setup after Osmocom CNI release 202302

Change-Id: If34b043a55177e6c0d1be3949fc2a2682258cc84
---
 ttcn3-bsc-test-vamos/jenkins.sh    |  6 +-----
 ttcn3-bsc-test/jenkins-sccplite.sh |  7 +------
 ttcn3-bsc-test/jenkins.sh          |  6 +-----
 ttcn3-bts-test/jenkins.sh          | 20 --------------------
 ttcn3-hnbgw-test/jenkins.sh        |  9 +++------
 ttcn3-mgw-test/jenkins.sh          |  4 ----
 6 files changed, 6 insertions(+), 46 deletions(-)

diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh
index c859fd63..219d813e 100755
--- a/ttcn3-bsc-test-vamos/jenkins.sh
+++ b/ttcn3-bsc-test-vamos/jenkins.sh
@@ -45,11 +45,7 @@ docker run	--rm \
 		$DOCKER_ARGS \
 		$REPO_USER/osmo-bsc-$IMAGE_SUFFIX
 
-BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION,VAMOS"
-# Disable until libosmocore release > 1.7.0
-if image_suffix_is_master; then
-	BTS_FEATURES="${BTS_FEATURES},OSMUX"
-fi
+BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION,VAMOS,OSMUX"
 
 for i in `seq 0 2`; do
 	echo Starting container with OML for BTS$i
diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh
index 7ba8c9e6..0446046a 100755
--- a/ttcn3-bsc-test/jenkins-sccplite.sh
+++ b/ttcn3-bsc-test/jenkins-sccplite.sh
@@ -31,12 +31,7 @@ docker run	--rm \
 		$DOCKER_ARGS \
 		$REPO_USER/osmo-bsc-$IMAGE_SUFFIX
 
-BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION"
-# Disable until libosmocore release > 1.7.0
-if image_suffix_is_master; then
-	BTS_FEATURES="${BTS_FEATURES},OSMUX"
-fi
-
+BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION,OSMUX"
 
 for i in "0 1" "1 1" "2 4"; do
 	set -- $i # convert the {BTS, TRXN} "tuple" into the param args $1 $2
diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh
index 149e0d1e..26ecce9b 100755
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@@ -44,11 +44,7 @@ docker run	--rm \
 		$DOCKER_ARGS \
 		$REPO_USER/osmo-bsc-$IMAGE_SUFFIX
 
-BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION"
-# Disable until libosmocore release > 1.7.0
-if image_suffix_is_master; then
-	BTS_FEATURES="${BTS_FEATURES},OSMUX"
-fi
+BTS_FEATURES="-fCCN,EGPRS,GPRS,IPv6_NSVC,PAGING_COORDINATION,OSMUX"
 
 for i in "0 1" "1 1" "2 4"; do
 	set -- $i # convert the {BTS, TRXN} "tuple" into the param args $1 $2
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 7d4d3dcf..0c1cbb0e 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -150,11 +150,6 @@ cp generic/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/
 mkdir $VOL_BASE_DIR/bts
 mkdir $VOL_BASE_DIR/bts/unix
 cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
-# Disable until osmo-bts release > 1.5.0
-if ! image_suffix_is_master; then
-	sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
-	sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
-fi
 
 mkdir $VOL_BASE_DIR/unix
 
@@ -177,11 +172,6 @@ docker container kill ${BUILD_TAG}-trxcon
 docker container kill ${BUILD_TAG}-fake_trx
 docker container kill ${BUILD_TAG}-bts
 cp virtphy/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
-# Disable until osmo-bts release > 1.5.0
-if ! image_suffix_is_master; then
-	sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
-	sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
-fi
 network_replace_subnet_in_configs
 start_bts virtual 0
 start_virtphy
@@ -195,11 +185,6 @@ docker container kill ${BUILD_TAG}-virtphy
 docker container kill ${BUILD_TAG}-bts
 
 cp oml/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
-# Disable until osmo-bts release > 1.5.0
-if ! image_suffix_is_master; then
-	sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
-	sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
-fi
 network_replace_subnet_in_configs
 start_bts trx 1
 start_fake_trx
@@ -210,11 +195,6 @@ start_testsuite oml
 # 4) Frequency hopping tests require different configuration files
 cp fh/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/
 cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/
-# Disable until osmo-bts release > 1.5.0
-if ! image_suffix_is_master; then
-	sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
-	sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg
-fi
 # restart the BSC/BTS and run the testsuite again
 docker container kill ${BUILD_TAG}-bts
 network_replace_subnet_in_configs
diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh
index 5a40e5bd..f3c56949 100755
--- a/ttcn3-hnbgw-test/jenkins.sh
+++ b/ttcn3-hnbgw-test/jenkins.sh
@@ -81,9 +81,6 @@ run_tests() {
 echo Testing without PFCP
 run_tests "$VOL_BASE_DIR" "HNBGW_Tests.cfg" "osmo-stp.cfg" "osmo-hnbgw.cfg"
 
-# Disable until osmo-hnbgw release >1.3.0
-if image_suffix_is_master; then
-	echo Testing with PFCP
-	mkdir "$VOL_BASE_DIR_PFCP"
-	run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg"
-fi
+echo Testing with PFCP
+mkdir "$VOL_BASE_DIR_PFCP"
+run_tests "$VOL_BASE_DIR_PFCP" "with-pfcp/HNBGW_Tests.cfg" "osmo-stp.cfg" "with-pfcp/osmo-hnbgw.cfg"
diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh
index 7b31f6dc..b2d78a72 100755
--- a/ttcn3-mgw-test/jenkins.sh
+++ b/ttcn3-mgw-test/jenkins.sh
@@ -15,10 +15,6 @@ write_mp_osmo_repo "$VOL_BASE_DIR/mgw-tester/MGCP_Test.cfg"
 
 mkdir $VOL_BASE_DIR/mgw
 cp osmo-mgw.cfg $VOL_BASE_DIR/mgw/
-# Can be dropped once released osmo-mgw is >1.10.0:
-if ! image_suffix_is_master; then
-	sed -i "/^ osmux bind-ip-v6 fd02:db8:4::180/d" $VOL_BASE_DIR/mgw/osmo-mgw.cfg
-fi
 
 network_create
 network_replace_subnet_in_configs