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 submitted this change. ( 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.
Related: OS#5042
Change-Id: I6f491b58d4576b22c8ff3ab56a7b9e17163a8739
---
M ttcn3-bsc-test/jenkins-sccplite.sh
M ttcn3-bsc-test/jenkins.sh
D ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg
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
D ttcn3-sgsn-test/osmo-sgsn.latest.cfg
M ttcn3-sip-test/jenkins.sh
M ttcn3-stp-test/jenkins.sh
16 files changed, 0 insertions(+), 641 deletions(-)
Approvals:
pespin: Verified
fixeria: Looks good to me, approved
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-bsc-test/pre-mscpool-osmo-bsc.cfg b/ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg
deleted file mode 100644
index a68e9d7..0000000
--- a/ttcn3-bsc-test/pre-mscpool-osmo-bsc.cfg
+++ /dev/null
@@ -1,395 +0,0 @@
-!
-! OsmoBSC (1.0.1.122-630df) configuration saved from vty
-!!
-password foo
-!
-log gsmtap 172.18.2.203
- logging level set-all debug
- logging filter all 1
-!
-log stderr
- logging filter all 1
- logging color 1
- logging print category 1
- logging timestamp 1
- logging print extended-timestamp 1
- logging print category-hex 0
- logging print file basename last
- logging print level 1
- logging level set-all debug
- logging level llapd notice
- logging level linp notice
- logging level lmux notice
- logging level lmi notice
- logging level lmib notice
- logging level lsms notice
- logging level lctrl notice
- logging level lgtp notice
- logging level lstats notice
- logging level lgsup notice
- logging level loap notice
- logging level lss7 notice
- logging level lsccp notice
- logging level lsua notice
- logging level lm3ua notice
- logging level lmgcp notice
-!
-stats interval 0
-stats reporter statsd
- prefix TTCN3
- level subscriber
- remote-ip 172.18.2.203
- remote-port 8125
- flush-period 1
- mtu 1024
- enable
-!
-!
-line vty
- no login
- bind 0.0.0.0
-!
-e1_input
- e1_line 0 driver ipa
- e1_line 0 port 0
- no e1_line 0 keepalive
-cs7 instance 0
- asp asp-clnt-msc-0 2905 2905 m3ua
- remote-ip 172.18.2.200
-network
- network country code 1
- mobile network code 1
- encryption a5 0 1 3
- neci 1
- paging any use tch 0
- handover 1
- handover window rxlev averaging 10
- handover window rxqual averaging 1
- handover window rxlev neighbor averaging 10
- handover power budget interval 6
- handover power budget hysteresis 3
- handover maximum distance 9999
- timer t3113 10
- timer t3212 30
- bts 0
- type sysmobts
- band DCS1800
- cell_identity 0
- location_area_code 1
- dtx uplink force
- dtx downlink
- base_station_id_code 10
- ms max power 15
- cell reselection hysteresis 4
- rxlev access min 0
- radio-link-timeout 32
- channel allocator ascending
- rach tx integer 9
- rach max transmission 7
- channel-descrption attach 1
- channel-descrption bs-pa-mfrms 5
- channel-descrption bs-ag-blks-res 1
- early-classmark-sending forbidden
- ip.access unit_id 1234 0
- oml ip.access stream_id 255 line 0
- neighbor-list mode manual-si5
- neighbor-list add arfcn 100
- neighbor-list add arfcn 200
- si5 neighbor-list add arfcn 10
- si5 neighbor-list add arfcn 20
- codec-support fr hr efr amr
- gprs mode gprs
- gprs routing area 0
- gprs network-control-order nc0
- gprs cell bvci 1234
- gprs cell timer blocking-timer 3
- gprs cell timer blocking-retries 3
- gprs cell timer unblocking-retries 3
- gprs cell timer reset-timer 3
- gprs cell timer reset-retries 3
- gprs cell timer suspend-timer 10
- gprs cell timer suspend-retries 3
- gprs cell timer resume-timer 10
- gprs cell timer resume-retries 3
- gprs cell timer capability-update-timer 10
- gprs cell timer capability-update-retries 3
- gprs nsei 1234
- gprs ns timer tns-block 3
- gprs ns timer tns-block-retries 3
- gprs ns timer tns-reset 3
- gprs ns timer tns-reset-retries 3
- gprs ns timer tns-test 30
- gprs ns timer tns-alive 3
- gprs ns timer tns-alive-retries 10
- gprs nsvc 0 nsvci 1234
- gprs nsvc 0 local udp port 23000
- gprs nsvc 0 remote udp port 23000
- gprs nsvc 0 remote ip 192.168.100.239
- gprs nsvc 1 nsvci 0
- gprs nsvc 1 local udp port 0
- gprs nsvc 1 remote udp port 0
- gprs nsvc 1 remote ip 0.0.0.0
- no force-combined-si
- si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3
- trx 0
- rf_locked 0
- arfcn 871
- nominal power 23
- max_power_red 20
- rsl e1 tei 0
- timeslot 0
- phys_chan_config CCCH+SDCCH4
- hopping enabled 0
- timeslot 1
- phys_chan_config TCH/F
- hopping enabled 0
- timeslot 2
- phys_chan_config TCH/F
- hopping enabled 0
- timeslot 3
- phys_chan_config TCH/F
- hopping enabled 0
- timeslot 4
- phys_chan_config TCH/F
- hopping enabled 0
- timeslot 5
- phys_chan_config TCH/H
- hopping enabled 0
- timeslot 6
- phys_chan_config PDCH
- hopping enabled 0
- timeslot 7
- phys_chan_config PDCH
- hopping enabled 0
- bts 1
- type sysmobts
- band DCS1800
- cell_identity 1
- location_area_code 1
- dtx uplink force
- dtx downlink
- base_station_id_code 11
- ms max power 15
- cell reselection hysteresis 4
- rxlev access min 0
- radio-link-timeout 32
- channel allocator ascending
- rach tx integer 9
- rach max transmission 7
- channel-descrption attach 1
- channel-descrption bs-pa-mfrms 5
- channel-descrption bs-ag-blks-res 1
- early-classmark-sending forbidden
- ip.access unit_id 1235 0
- oml ip.access stream_id 255 line 0
- neighbor-list mode manual-si5
- neighbor-list add arfcn 100
- neighbor-list add arfcn 200
- si5 neighbor-list add arfcn 10
- si5 neighbor-list add arfcn 20
- codec-support fr hr efr amr
- gprs mode gprs
- gprs routing area 0
- gprs network-control-order nc0
- gprs cell bvci 1235
- gprs cell timer blocking-timer 3
- gprs cell timer blocking-retries 3
- gprs cell timer unblocking-retries 3
- gprs cell timer reset-timer 3
- gprs cell timer reset-retries 3
- gprs cell timer suspend-timer 10
- gprs cell timer suspend-retries 3
- gprs cell timer resume-timer 10
- gprs cell timer resume-retries 3
- gprs cell timer capability-update-timer 10
- gprs cell timer capability-update-retries 3
- gprs nsei 1235
- gprs ns timer tns-block 3
- gprs ns timer tns-block-retries 3
- gprs ns timer tns-reset 3
- gprs ns timer tns-reset-retries 3
- gprs ns timer tns-test 30
- gprs ns timer tns-alive 3
- gprs ns timer tns-alive-retries 10
- gprs nsvc 0 nsvci 1235
- gprs nsvc 0 local udp port 23000
- gprs nsvc 0 remote udp port 23000
- gprs nsvc 0 remote ip 192.168.100.239
- gprs nsvc 1 nsvci 0
- gprs nsvc 1 local udp port 0
- gprs nsvc 1 remote udp port 0
- gprs nsvc 1 remote ip 0.0.0.0
- no force-combined-si
- si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3
- trx 0
- rf_locked 0
- arfcn 871
- nominal power 23
- max_power_red 20
- rsl e1 tei 0
- timeslot 0
- phys_chan_config CCCH+SDCCH4
- hopping enabled 0
- timeslot 1
- phys_chan_config TCH/F
- hopping enabled 0
- timeslot 2
- phys_chan_config TCH/F
- hopping enabled 0
- timeslot 3
- phys_chan_config TCH/F
- hopping enabled 0
- timeslot 4
- phys_chan_config TCH/F
- hopping enabled 0
- timeslot 5
- phys_chan_config TCH/H
- hopping enabled 0
- timeslot 6
- phys_chan_config PDCH
- hopping enabled 0
- timeslot 7
- phys_chan_config PDCH
- hopping enabled 0
- bts 2
- type sysmobts
- band DCS1800
- cell_identity 1
- location_area_code 2
- dtx uplink force
- dtx downlink
- base_station_id_code 12
- ms max power 15
- cell reselection hysteresis 4
- rxlev access min 0
- radio-link-timeout 32
- channel allocator ascending
- rach tx integer 9
- rach max transmission 7
- channel-descrption attach 1
- channel-descrption bs-pa-mfrms 5
- channel-descrption bs-ag-blks-res 1
- early-classmark-sending forbidden
- ip.access unit_id 1236 0
- oml ip.access stream_id 255 line 0
- neighbor-list mode manual-si5
- neighbor-list add arfcn 100
- neighbor-list add arfcn 200
- si5 neighbor-list add arfcn 10
- si5 neighbor-list add arfcn 20
- codec-support fr hr efr amr
- gprs mode gprs
- gprs routing area 0
- gprs network-control-order nc0
- gprs cell bvci 1236
- gprs cell timer blocking-timer 3
- gprs cell timer blocking-retries 3
- gprs cell timer unblocking-retries 3
- gprs cell timer reset-timer 3
- gprs cell timer reset-retries 3
- gprs cell timer suspend-timer 10
- gprs cell timer suspend-retries 3
- gprs cell timer resume-timer 10
- gprs cell timer resume-retries 3
- gprs cell timer capability-update-timer 10
- gprs cell timer capability-update-retries 3
- gprs nsei 1236
- gprs ns timer tns-block 3
- gprs ns timer tns-block-retries 3
- gprs ns timer tns-reset 3
- gprs ns timer tns-reset-retries 3
- gprs ns timer tns-test 30
- gprs ns timer tns-alive 3
- gprs ns timer tns-alive-retries 10
- gprs nsvc 0 nsvci 1236
- gprs nsvc 0 local udp port 23000
- gprs nsvc 0 remote udp port 23000
- gprs nsvc 0 remote ip 192.168.100.239
- gprs nsvc 1 nsvci 0
- gprs nsvc 1 local udp port 0
- gprs nsvc 1 remote udp port 0
- gprs nsvc 1 remote ip 0.0.0.0
- no force-combined-si
- si2quater neighbor-list add earfcn 111 thresh-hi 20 thresh-lo 10 prio 3 qrxlv 22 meas 3
- trx 0
- rf_locked 0
- arfcn 871
- nominal power 23
- max_power_red 20
- rsl e1 tei 0
- timeslot 0
- phys_chan_config CCCH+SDCCH4
- hopping enabled 0
- timeslot 1
- phys_chan_config TCH/F
- hopping enabled 0
- timeslot 2
- phys_chan_config TCH/F
- hopping enabled 0
- timeslot 3
- phys_chan_config TCH/F
- hopping enabled 0
- timeslot 4
- phys_chan_config TCH/F
- hopping enabled 0
- timeslot 5
- phys_chan_config TCH/H
- hopping enabled 0
- timeslot 6
- phys_chan_config PDCH
- hopping enabled 0
- timeslot 7
- phys_chan_config PDCH
- hopping enabled 0
- bts 3
- type sysmobts
- band DCS1800
- cell_identity 3
- location_area_code 3
- # re-use bts 2's ARFCN 871 and BSIC 12 (to test handover config)
- base_station_id_code 12
- trx 0
- rf_locked 0
- arfcn 871
- nominal power 23
- max_power_red 20
- rsl e1 tei 0
- timeslot 0
- phys_chan_config CCCH+SDCCH4
- timeslot 1
- phys_chan_config TCH/F
- timeslot 2
- phys_chan_config TCH/F
- timeslot 3
- phys_chan_config TCH/F
- timeslot 4
- phys_chan_config TCH/F
- timeslot 5
- phys_chan_config TCH/H
- timeslot 6
- phys_chan_config PDCH
- timeslot 7
- phys_chan_config PDCH
-msc 0
- no bsc-welcome-text
- no bsc-msc-lost-text
- no bsc-grace-text
- type normal
- allow-emergency allow
- amr-config 12_2k forbidden
- amr-config 10_2k forbidden
- amr-config 7_95k forbidden
- amr-config 7_40k forbidden
- amr-config 6_70k forbidden
- amr-config 5_90k allowed
- amr-config 5_15k forbidden
- amr-config 4_75k forbidden
- codec-list fr1 fr2 fr3 hr1 hr3
- mgw remote-ip 172.18.2.203
- lcls-mode mgw-loop
-
-bsc
- mid-call-timeout 0
- no missing-msc-text
-ctrl
- bind 0.0.0.0
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-sgsn-test/osmo-sgsn.latest.cfg b/ttcn3-sgsn-test/osmo-sgsn.latest.cfg
deleted file mode 100644
index 5cee7d4..0000000
--- a/ttcn3-sgsn-test/osmo-sgsn.latest.cfg
+++ /dev/null
@@ -1,101 +0,0 @@
-!
-! OsmoSGSN (1.2.0.46-e77e-dirty) configuration saved from vty
-!!
-!
-log gsmtap 172.18.8.103
- logging level set-all debug
- logging filter all 1
-!
-log stderr
- logging filter all 1
- logging color 1
- logging print category 1
- logging timestamp 1
- logging print extended-timestamp 1
- logging print file 1
- logging level all everything
- logging level mm debug
- logging level pag notice
- logging level meas notice
- logging level ref notice
- logging level gprs debug
- logging level ns info
- logging level bssgp info
- logging level llc debug
- logging level sndcp debug
- logging level slhc notice
- logging level ranap info
- logging level sua info
- logging level v42bis info
- logging level lglobal info
- logging level llapd notice
- logging level linp notice
- logging level lmux notice
- logging level lmi notice
- logging level lmib notice
- logging level lsms notice
- logging level lctrl notice
- logging level lgtp debug
- logging level lstats notice
- logging level lgsup debug
- logging level loap notice
- logging level lss7 notice
- logging level lsccp info
- logging level lsua notice
- logging level lm3ua notice
- logging level lmgcp notice
-!
-stats interval 5
-!
-line vty
- no login
- bind 0.0.0.0
-ctrl
- bind 0.0.0.0
-!
-cs7 instance 0
- point-code 0.23.4
- asp asp-clnt-OsmoSGSN-A 2905 0 m3ua
- local-ip 172.18.8.10
- remote-ip 172.18.8.200
- as as-clnt-OsmoSGSN-A m3ua
- asp asp-clnt-OsmoSGSN-A
- routing-key 3 0.23.4
-ns
- timer tns-block 3
- timer tns-block-retries 3
- timer tns-reset 3
- timer tns-reset-retries 3
- timer tns-test 30
- timer tns-alive 3
- timer tns-alive-retries 10
- encapsulation udp local-ip 172.18.8.10
- encapsulation udp local-port 23000
- encapsulation framerelay-gre enabled 0
-bssgp
-sgsn
- gtp local-ip 172.18.8.10
- ggsn 0 remote-ip 172.18.8.103
- ggsn 0 gtp-version 1
- gsup remote-ip 172.18.8.103
- gsup remote-port 4222
- auth-policy remote
- gsup oap-id 0
- ! apn * ggsn 0
- no cdr filename
- no cdr trap
- cdr interval 600
- timer t3312 600
- timer t3322 6
- timer t3350 6
- timer t3360 6
- timer t3370 6
- timer t3313 30
- timer t3314 44
- timer t3316 44
- timer t3385 8
- timer t3386 8
- timer t3395 8
- timer t3397 8
- no compression rfc1144
- no compression v42bis
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: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
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/20210225/b94aefa0/attachment.htm>