This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23053 )
Change subject: Remove test backward compatibility with older osmo-* versions
......................................................................
Remove test backward compatibility with older osmo-* versions
These changes are no longer needed since master versions of whole CNI
have been recently released.
Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739
---
M ttcn3-bsc-test/jenkins-sccplite.sh
M ttcn3-bsc-test/jenkins.sh
M ttcn3-bts-test/jenkins.sh
M ttcn3-fr-test/jenkins.sh
M ttcn3-gbproxy-test-fr/jenkins.sh
M ttcn3-gbproxy-test/jenkins.sh
M ttcn3-hlr-test/jenkins.sh
M ttcn3-mgw-test/jenkins.sh
M ttcn3-msc-test/jenkins.sh
M ttcn3-pcu-test/jenkins-sns.sh
M ttcn3-pcu-test/jenkins.sh
M ttcn3-sgsn-test/jenkins.sh
M ttcn3-sip-test/jenkins.sh
M ttcn3-stp-test/jenkins.sh
14 files changed, 0 insertions(+), 145 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/53/23053/1
diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh
index ab8c06d..c040a0a 100755
--- a/ttcn3-bsc-test/jenkins-sccplite.sh
+++ b/ttcn3-bsc-test/jenkins-sccplite.sh
@@ -19,13 +19,6 @@
SUBNET=12
network_create $SUBNET
-# Disable stats testing until libosmocore release > 1.4.0
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg
- sed -i "s/stats interval 0//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg
- sed -i "s/flush-period 1//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg
-fi
-
echo Starting container with BSC
docker run --rm \
$(docker_network_params $SUBNET 20) \
diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh
index cba378e..a807c49 100755
--- a/ttcn3-bsc-test/jenkins.sh
+++ b/ttcn3-bsc-test/jenkins.sh
@@ -19,30 +19,6 @@
mkdir $VOL_BASE_DIR/bts-omldummy
-# Disable MSC pooling features until osmo-bsc.git release > 1.6.0 is available
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- cp pre-mscpool-osmo-bsc.cfg $VOL_BASE_DIR/bsc/osmo-bsc.cfg
-fi
-
-# Disable stats testing until libosmocore release > 1.4.0
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg
- sed -i "s/stats interval 0//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg
- sed -i "s/flush-period 1//" $VOL_BASE_DIR/bsc/osmo-bsc.cfg
-fi
-
-# Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- sed "/fd02:db8/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg
- sed "/fd02:db8/d" -i $VOL_BASE_DIR/bsc/osmo-bsc.cfg
- sed -i "s/^BSC_Tests.mp_media_mgw_offer_ipv6.*/BSC_Tests.mp_media_mgw_offer_ipv6 := false;/" $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg
-fi
-
-# Disable LCS tests until osmo-bsc > 1.6.0
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- sed -i 's/^BSC_Tests.mp_enable_lcs_tests.*/BSC_Tests.mp_enable_lcs_tests := false;/' $VOL_BASE_DIR/bsc-tester/BSC_Tests.cfg
-fi
-
SUBNET=2
network_create $SUBNET
diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh
index 87e2896..8381a8b 100755
--- a/ttcn3-bts-test/jenkins.sh
+++ b/ttcn3-bts-test/jenkins.sh
@@ -114,16 +114,6 @@
mkdir $VOL_BASE_DIR/bts-tester-hopping
cp fh/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-hopping/
-# TODO: revisit this section every time we tag a new release
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- # Work around for a bug in osmo-bts causing all transceivers to use IPAC_PROTO_RSL_TRX0
- sed "s/RSL_Emulation.mp_rslem_patch_ipa_cid := false/RSL_Emulation.mp_rslem_patch_ipa_cid := true/g" \
- -i "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg"
- # PCUIFv10 is not yet supported in the latest release
- sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \
- -i "$VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg"
-fi
-
cp $VOL_BASE_DIR/bts-tester-generic/BTS_Tests.cfg \
$VOL_BASE_DIR/bts-tester-hopping/BTS_Tests.cfg.inc
diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh
index faf8170..9402006 100755
--- a/ttcn3-fr-test/jenkins.sh
+++ b/ttcn3-fr-test/jenkins.sh
@@ -17,11 +17,6 @@
mkdir $VOL_BASE_DIR/frnet
cp FRNET_Tests.cfg $VOL_BASE_DIR/frnet/
-# Disable features not in latest yet
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- true;
-fi
-
mkdir $VOL_BASE_DIR/unix
echo Starting container with FRNET
diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh
index 4ef2ace..352731f 100755
--- a/ttcn3-gbproxy-test-fr/jenkins.sh
+++ b/ttcn3-gbproxy-test-fr/jenkins.sh
@@ -30,11 +30,6 @@
mkdir $VOL_BASE_DIR/gbproxy
cp osmo-gbproxy.cfg $VOL_BASE_DIR/gbproxy/
-# Disable features not in latest yet
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- true;
-fi
-
mkdir $VOL_BASE_DIR/unix
echo Starting container with gbproxy
diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh
index b063c7f..cc29a3c 100755
--- a/ttcn3-gbproxy-test/jenkins.sh
+++ b/ttcn3-gbproxy-test/jenkins.sh
@@ -18,11 +18,6 @@
mkdir $VOL_BASE_DIR/gbproxy
cp osmo-gbproxy.cfg $VOL_BASE_DIR/gbproxy/
-# Disable features not in latest yet
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- true;
-fi
-
mkdir $VOL_BASE_DIR/unix
echo Starting container with gbproxy
diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh
index 93ba6c3..51a33e8 100755
--- a/ttcn3-hlr-test/jenkins.sh
+++ b/ttcn3-hlr-test/jenkins.sh
@@ -12,12 +12,6 @@
mkdir $VOL_BASE_DIR/hlr-tester
cp HLR_Tests.cfg $VOL_BASE_DIR/hlr-tester/
-# Disable D-GSM tests until osmo-hlr.git release > 1.2.0 is available
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- sed "s/HLR_Tests.mp_hlr_supports_dgsm := true/HLR_Tests.mp_hlr_supports_dgsm := false/g" -i \
- "$VOL_BASE_DIR/hlr-tester/HLR_Tests.cfg"
-fi
-
mkdir $VOL_BASE_DIR/hlr
cp osmo-hlr.cfg $VOL_BASE_DIR/hlr/
diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh
index c49096b..c704005 100755
--- a/ttcn3-mgw-test/jenkins.sh
+++ b/ttcn3-mgw-test/jenkins.sh
@@ -15,15 +15,6 @@
SUBNET=4
network_create $SUBNET
-# Disable e1 config options until osmo-mgw >= 1.8.0 release
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- sed -i "s/e1_line.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg
- sed -i "s/e1_input.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg
- sed -i "s/line 0.*//" $VOL_BASE_DIR/mgw/osmo-mgw.cfg
- # Disable IPv6 until osmo-mgw .git release > 1.7.0 is available
- sed "/fd02:db8/d" -i $VOL_BASE_DIR/mgw/osmo-mgw.cfg
-fi
-
# start container with mgw in background
docker run --rm \
$(docker_network_params $SUBNET 180) \
diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh
index c67fb5e..90770cb 100755
--- a/ttcn3-msc-test/jenkins.sh
+++ b/ttcn3-msc-test/jenkins.sh
@@ -14,18 +14,6 @@
mkdir $VOL_BASE_DIR/msc-tester/unix
cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/
-# Disable verification of VLR and conn Cell ID until osmo-msc.git release > 1.6.1 is available
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- sed "s/MSC_Tests.mp_enable_cell_id_test := true/MSC_Tests.mp_enable_cell_id_test := false/" -i \
- "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg"
- sed "s/BSC_ConnectionHandler.mp_expect_common_id := true/BSC_ConnectionHandler.mp_expect_common_id := false/" -i \
- "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg"
- sed "s/MSC_Tests.mp_enable_crashing_tests := true/MSC_Tests.mp_enable_crashing_tests := false/" -i \
- "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg"
- sed "s/MNCC_Emulation.mp_mncc_version := 7/MNCC_Emulation.mp_mncc_version := 6/" -i \
- "$VOL_BASE_DIR/msc-tester/MSC_Tests.cfg"
-fi
-
mkdir $VOL_BASE_DIR/stp
cp osmo-stp.cfg $VOL_BASE_DIR/stp/
@@ -33,12 +21,6 @@
mkdir $VOL_BASE_DIR/msc/unix
cp osmo-msc.cfg $VOL_BASE_DIR/msc/
-# Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- sed "/fd02:db8/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg
- sed "/fd02:db8/d" -i $VOL_BASE_DIR/msc/osmo-msc.cfg
-fi
-
mkdir $VOL_BASE_DIR/unix
echo Starting container with STP
diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh
index ee0b08a..9428776 100755
--- a/ttcn3-pcu-test/jenkins-sns.sh
+++ b/ttcn3-pcu-test/jenkins-sns.sh
@@ -19,22 +19,6 @@
mkdir $VOL_BASE_DIR/unix
-# TODO: revisit this section every time we tag a new release
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- # PCUIFv10 is not yet supported in the latest release
- sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \
- -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg"
- # Tolerate CellId IE in BVC-RESET for BVCO=0
- sed -e "/\[MODULE_PARAMETERS\]/ a BSSGP_Emulation.mp_tolerate_bvc_reset_cellid := true;" \
- -e "/\[MODULE_PARAMETERS\]/ a PCU_Tests_NS.mp_tolerate_bvc_reset_cellid := true;" \
- -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg"
-
- # Disable stats testing until libosmocore release > 1.4.0
- sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg
- sed -i "s/stats interval 0//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg
- sed -i "s/flush-period 1//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg
-fi
-
echo Starting container with PCU
docker run --rm \
$(docker_network_params $SUBNET 101) \
diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh
index c2ef0d5..5dedec7 100755
--- a/ttcn3-pcu-test/jenkins.sh
+++ b/ttcn3-pcu-test/jenkins.sh
@@ -19,25 +19,6 @@
mkdir $VOL_BASE_DIR/unix
-# TODO: revisit this section every time we tag a new release
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- # PCUIFv10 is not yet supported in the latest release
- sed "/\[MODULE_PARAMETERS\]/ a PCUIF_Types.mp_pcuif_version := 9;" \
- -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg"
- # Tolerate CellId IE in BVC-RESET for BVCO=0
- sed -e "/\[MODULE_PARAMETERS\]/ a BSSGP_Emulation.mp_tolerate_bvc_reset_cellid := true;" \
- -e "/\[MODULE_PARAMETERS\]/ a PCU_Tests_NS.mp_tolerate_bvc_reset_cellid := true;" \
- -i "$VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg"
-
- # Disable stats testing until libosmocore release > 1.4.0
- sed -i "s/^StatsD_Checker.mp_enable_stats.*/StatsD_Checker.mp_enable_stats := false;/" $VOL_BASE_DIR/pcu-tester/PCU_Tests.cfg
- sed -i "s/stats interval 0//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg
- sed -i "s/flush-period 1//" $VOL_BASE_DIR/pcu/osmo-pcu.cfg
-
- # neighbor resolution only available in osmo-pcu > 0.8.0
- sed "/neighbor resolution/d" -i $VOL_BASE_DIR/pcu/osmo-pcu.cfg
-fi
-
echo Starting container with PCU
docker run --rm \
$(docker_network_params $SUBNET 101) \
diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh
index 35eaf2e..9e16c3e 100755
--- a/ttcn3-sgsn-test/jenkins.sh
+++ b/ttcn3-sgsn-test/jenkins.sh
@@ -19,14 +19,6 @@
mkdir $VOL_BASE_DIR/stp
cp osmo-stp.cfg $VOL_BASE_DIR/stp/
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- # Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available
- sed "/fd02:db8/d" -i $VOL_BASE_DIR/stp/osmo-stp.cfg
-
- # latest doesn't use yet the NS2 code
- cp osmo-sgsn.latest.cfg "$VOL_BASE_DIR/sgsn/osmo-sgsn.cfg"
-fi
-
mkdir $VOL_BASE_DIR/unix
echo Starting container with STP
diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh
index af5e40b..36252b0 100755
--- a/ttcn3-sip-test/jenkins.sh
+++ b/ttcn3-sip-test/jenkins.sh
@@ -13,12 +13,6 @@
mkdir $VOL_BASE_DIR/sip-tester/unix
cp SIP_Tests.cfg $VOL_BASE_DIR/sip-tester/
-# Can be removed once osmo-sip-connector > 1.4.1 is available
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- sed "s/MNCC_Emulation.mp_mncc_version := 7/MNCC_Emulation.mp_mncc_version := 6/" -i \
- "$VOL_BASE_DIR/sip-tester/SIP_Tests.cfg"
-fi
-
mkdir $VOL_BASE_DIR/sip
mkdir $VOL_BASE_DIR/sip/unix
cp osmo-sip-connector.cfg $VOL_BASE_DIR/sip/
diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh
index 9ea97cb..1b20c3f 100755
--- a/ttcn3-stp-test/jenkins.sh
+++ b/ttcn3-stp-test/jenkins.sh
@@ -12,13 +12,6 @@
mkdir $VOL_BASE_DIR/stp
cp osmo-stp.cfg $VOL_BASE_DIR/stp/
-# Disable IPv6 until libosmo-sccp.git release > 1.3.0 is available
-if [ "$IMAGE_SUFFIX" = "latest" ]; then
- sed "/fd02:db8/d" -i "$VOL_BASE_DIR/stp/osmo-stp.cfg"
- sed 's/, "fd02:db8:19::203"//g' -i "$VOL_BASE_DIR/stp-tester/STP_Tests.cfg"
- sed 's/, "fd02:db8:19::200"//g' -i "$VOL_BASE_DIR/stp-tester/STP_Tests.cfg"
-fi
-
SUBNET=19
network_create $SUBNET
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23053
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739
Gerrit-Change-Number: 23053
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210223/a7f4cf98/attachment.htm>