February 2023 - gerrit-log - lists.osmocom.org

Change in docker-playground[master]: ttcn3-*: Update test setup after Osmocom CNI release 202302

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31245 ) Change subject: ttcn3-*: Update test setup after Osmocom CNI release 202302 ...................................................................... ttcn3-*: Update test setup after Osmocom CNI release 202302 Change-Id: If34b043a55177e6c0d1be3949fc2a2682258cc84 --- M ttcn3-bsc-test-vamos/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-hnbgw-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh 6 files changed, 6 insertions(+), 46 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index c859fd6..219d813 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -45,11 +45,7 @@ $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 7ba8c9e..0446046 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -31,12 +31,7 @@ $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 149e0d1..26ecce9 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -44,11 +44,7 @@ $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 7d4d3dc..0c1cbb0 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -150,11 +150,6 @@ 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}-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}-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 @@ # 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 5a40e5b..f3c5694 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -81,9 +81,6 @@ 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 7b31f6d..b2d78a7 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -15,10 +15,6 @@ 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 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If34b043a55177e6c0d1be3949fc2a2682258cc84 Gerrit-Change-Number: 31245 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: : Update UIT version expectancies after Osmocom CNI release 202302

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31246 ) Change subject: : Update UIT version expectancies after Osmocom CNI release 202302 ...................................................................... : Update UIT version expectancies after Osmocom CNI release 202302 Change-Id: Iec06390a1de9391ab573e66f9bd3421f4a627c6d --- M bsc/BSC_Tests.ttcn M gbproxy/GBProxy_Tests.ttcn 2 files changed, 15 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/31246/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 6902744..439b234 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1301,15 +1301,13 @@ f_wait_oml(bts_idx, "connected", 5.0); /* Set up BTS with VTY commands: */ - if (Misc_Helpers.f_osmo_repo_is("nightly")) { - f_vty_enter_cfg_bts(BSCVTY, bts_idx); - if (g_osmux_enabled_bts) { - f_vty_transceive(BSCVTY, "osmux on"); - } else { - f_vty_transceive(BSCVTY, "osmux off"); - } - f_vty_transceive(BSCVTY, "end"); + f_vty_enter_cfg_bts(BSCVTY, bts_idx); + if (g_osmux_enabled_bts) { + f_vty_transceive(BSCVTY, "osmux on"); + } else { + f_vty_transceive(BSCVTY, "osmux off"); } + f_vty_transceive(BSCVTY, "end"); } function f_init_bts_and_check_sysinfo(integer bts_idx := 0, @@ -3616,9 +3614,7 @@ /* read counters before paging */ paging_attempted_bsc := f_ctrl_get_ratectr_abs(IPA_CTRL, "bsc", 0, "paging:attempted"); - if (Misc_Helpers.f_osmo_repo_is("nightly")) { /* osmo-bsc > 1.8.0 */ - paging_expired_bsc := f_ctrl_get_ratectr_abs(IPA_CTRL, "bsc", 0, "paging:expired"); - } + paging_expired_bsc := f_ctrl_get_ratectr_abs(IPA_CTRL, "bsc", 0, "paging:expired"); for (i := 0; i < NUM_BTS; i := i+1) { paging_attempted_bts[i] := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", i, "paging:attempted"); paging_expired_bts[i] := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", i, "paging:expired"); @@ -3635,9 +3631,7 @@ /* assume that 12s later the paging on all BTSs have expired and hence incremented by 1 */ f_sleep(12.0); - if (Misc_Helpers.f_osmo_repo_is("nightly")) { /* osmo-bsc > 1.8.0 */ - f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bsc", 0, "paging:expired", paging_expired_bsc+1); - } + f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bsc", 0, "paging:expired", paging_expired_bsc+1); for (i := 0; i < NUM_BTS; i := i+1) { f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", i, "paging:expired", paging_expired_bts[i]+1); @@ -12454,12 +12448,9 @@ execute( TC_chan_alloc_algo_ass_dynamic() ); /* MGW pool */ - /* TODO: this conditional canbe dropped once osmo-bsc >1.10.0 is released: */ - if (Misc_Helpers.f_osmo_repo_is("nightly")) { - execute( TC_mgwpool_all_used() ); - execute( TC_mgwpool_blocked_not_used() ); - execute( TC_mgwpool_pin_bts() ); - } + execute( TC_mgwpool_all_used() ); + execute( TC_mgwpool_blocked_not_used() ); + execute( TC_mgwpool_pin_bts() ); execute( TC_ho_meas_rep_multi_band() ); diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn index 9f7d17a..d32e3bb 100644 --- a/gbproxy/GBProxy_Tests.ttcn +++ b/gbproxy/GBProxy_Tests.ttcn @@ -3701,10 +3701,8 @@ control { execute( TC_BVC_bringup() ); - /* Depends on osmo-gbproxy > 0.2.0 */ - if (Misc_Helpers.f_osmo_repo_is("nightly")) { - execute( TC_BVC_bringup_conflicting() ); - } + execute( TC_BVC_bringup_conflicting() ); + execute( TC_ul_unitdata() ); execute( TC_ul_unitdata_pool_failure() ); execute( TC_dl_unitdata() ); @@ -3786,10 +3784,8 @@ execute( TC_flush_ll_bvci_new() ); - /* Depends on osmo-gbproxy > 0.2.0 */ - if (Misc_Helpers.f_osmo_repo_is("nightly")) { - execute( TC_flush_ll_no_bvci_new() ); - } + execute( TC_flush_ll_no_bvci_new() ); + execute( TC_fc_bvc() ); execute( TC_fc_ms() ); execute( TC_ms_reg_enq() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec06390a1de9391ab573e66f9bd3421f4a627c6d Gerrit-Change-Number: 31246 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-*: Update test setup after Osmocom CNI release 202302

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31245 ) Change subject: ttcn3-*: Update test setup after Osmocom CNI release 202302 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If34b043a55177e6c0d1be3949fc2a2682258cc84 Gerrit-Change-Number: 31245 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 Feb 2023 11:40:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-*: Update test setup after Osmocom CNI release 202302

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31245 ) Change subject: ttcn3-*: Update test setup after Osmocom CNI release 202302 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If34b043a55177e6c0d1be3949fc2a2682258cc84 Gerrit-Change-Number: 31245 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 Feb 2023 11:39:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-*: Update test setup after Osmocom CNI release 202302

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/31245 ) Change subject: ttcn3-*: Update test setup after Osmocom CNI release 202302 ...................................................................... ttcn3-*: Update test setup after Osmocom CNI release 202302 Change-Id: If34b043a55177e6c0d1be3949fc2a2682258cc84 --- M ttcn3-bsc-test-vamos/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-hnbgw-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh 6 files changed, 6 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/45/31245/1 diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index c859fd6..219d813 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -45,11 +45,7 @@ $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 7ba8c9e..0446046 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -31,12 +31,7 @@ $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 149e0d1..26ecce9 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -44,11 +44,7 @@ $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 7d4d3dc..0c1cbb0 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -150,11 +150,6 @@ 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}-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}-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 @@ # 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 5a40e5b..f3c5694 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -81,9 +81,6 @@ 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 7b31f6d..b2d78a7 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -15,10 +15,6 @@ 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 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31245 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If34b043a55177e6c0d1be3949fc2a2682258cc84 Gerrit-Change-Number: 31245 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in docker-playground[master]: jenkins-common.sh: open5gs-latest does not require debian-bullseye-build

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31240 ) Change subject: jenkins-common.sh: open5gs-latest does not require debian-bullseye-build ...................................................................... jenkins-common.sh: open5gs-latest does not require debian-bullseye-build We're not *building* anything for the open5gs-latest, but simply downloading and installing DEBs from Sukchan's opensuse.org repo. Change-Id: Iec7ccab28c37d274a731e08a2f893ec0514c1068 Fixes: 62ac21133a828bab849c072f27664102790fcb91 --- M jenkins-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/jenkins-common.sh b/jenkins-common.sh index a607f9a..b09db58 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -21,7 +21,7 @@ osmo-*-centos8) echo "centos8-build" ;; osmo-*-latest) echo "debian-bullseye-obs-latest" ;; osmo-*) echo "debian-bullseye-build" ;; - open5gs-*) echo "debian-bullseye-build" ;; + open5gs-master) echo "debian-bullseye-build" ;; ttcn3-*) echo "debian-bullseye-titan" ;; esac } -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iec7ccab28c37d274a731e08a2f893ec0514c1068 Gerrit-Change-Number: 31240 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

Change in docker-playground[master]: jenkins-common.sh: open5gs-latest does not require debian-bullseye-build

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31240 ) Change subject: jenkins-common.sh: open5gs-latest does not require debian-bullseye-build ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iec7ccab28c37d274a731e08a2f893ec0514c1068 Gerrit-Change-Number: 31240 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 Feb 2023 10:51:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in docker-playground[master]: jenkins-common.sh: open5gs-latest does not require debian-bullseye-build

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/31240 ) Change subject: jenkins-common.sh: open5gs-latest does not require debian-bullseye-build ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > maybe explain why not? ;) Done. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iec7ccab28c37d274a731e08a2f893ec0514c1068 Gerrit-Change-Number: 31240 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 08 Feb 2023 10:47:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in docker-playground[master]: jenkins-common.sh: open5gs-latest does not require debian-bullseye-build

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/31240 to look at the new patch set (#2). Change subject: jenkins-common.sh: open5gs-latest does not require debian-bullseye-build ...................................................................... jenkins-common.sh: open5gs-latest does not require debian-bullseye-build We're not *building* anything for the open5gs-latest, but simply downloading and installing DEBs from Sukchan's opensuse.org repo. Change-Id: Iec7ccab28c37d274a731e08a2f893ec0514c1068 Fixes: 62ac21133a828bab849c072f27664102790fcb91 --- M jenkins-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/40/31240/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31240 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iec7ccab28c37d274a731e08a2f893ec0514c1068 Gerrit-Change-Number: 31240 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/GSM_Types: fix encoding of BcdMccMnc (3 octets)

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31241 ) Change subject: library/GSM_Types: fix encoding of BcdMccMnc (3 octets) ...................................................................... library/GSM_Types: fix encoding of BcdMccMnc (3 octets) In [1] I copied the hexstring concatenation statement for the 3-digit MNC from the original function f_enc_BcdMccMnc(), which was renamed to f_enc_BcdMccMnc_int(). Unfortunately, this statement (originally introduced in commit [2]) is incorrect. In our implementation a pair of MCC and MNC is encoded as follows: | MCC digit 1 | MCC digit 2 | octet 1 | MNC digit 3 | MCC digit 3 | octet 2 | MNC digit 1 | MNC digit 2 | octet 3 Additionally, in the case of a 2-digit MNC, the original variant of f_enc_BcdMccMnc() (before [1]) would swap MCC and MCC in the 2nd octet, generating even more unpredictable results. According to 3GPP TS 24.008, Figure 10.5.13, the correct coding is: | MCC digit 2 | MCC digit 1 | octet 1 | MNC digit 3 | MCC digit 3 | octet 2 | MNC digit 2 | MNC digit 1 | octet 3 So far the only user of this API is the PCU_Tests module. Looking at the PCAPs of testcases invoking this function, Wireshark indeed shows weird MCC/MNC values (expected 262/42): Routing area identification: 23-43-423-2 Mobile Country Code (MCC): Unknown (23) Mobile Network Code (MNC): Unknown (43) Location Area Code (LAC): 0x01a7 (423) Routing Area Code (RAC): 0x02 (2) Change-Id: Ifa3083fdd6307b56baa1ef3ac85a3e7a2efab728 Related: [1] 7a92d5fbc008ba7c3085fe1b524424a32da3a49f Fixes: [2] 0637ba072820a370ed539ab0e23f8ded8bce6d16 --- M library/GSM_Types.ttcn 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn index 07da576..134edbd 100644 --- a/library/GSM_Types.ttcn +++ b/library/GSM_Types.ttcn @@ -440,7 +440,11 @@ if (lengthof(mnc) == 2) { mnc := mnc[0] & mnc[1] & 'F'H; } - return mcc[0] & mcc[1] & mnc[2] & mcc[2] & mnc[0] & mnc[1]; + /* 3GPP TS 24.008, Figure 10.5.13 + * | MCC digit 2 | MCC digit 1 | octet 1 + * | MNC digit 3 | MCC digit 3 | octet 2 + * | MNC digit 2 | MNC digit 1 | octet 3 */ + return mcc[1] & mcc[0] & mnc[2] & mcc[2] & mnc[1] & mnc[0]; } /* Compute BcdMccMnc from integer values */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31241 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifa3083fdd6307b56baa1ef3ac85a3e7a2efab728 Gerrit-Change-Number: 31241 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023