Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.10/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.10/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.10/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 155s] [COMPILING apps/dfu/main.c] [ 155s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 155s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 155s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 156s] Memory region Used Size Region Size %age Used [ 156s] rom: 16580 B16 KB101.20% [ 156s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 156s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 156s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 156s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 156s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 156s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 156s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 196 bytes [ 156s] collect2: error: ld returned 1 exit status [ 156s] % [ 156s] make[2]: *** [Makefile:234: flash] Error 1 [ 156s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 156s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 156s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 156s] dh_auto_build: error: make -j1 returned exit code 2 [ 156s] make: *** [debian/rules:16: build] Error 25 [ 156s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 156s] ### VM INTERACTION START ### [ 159s] [ 146.641572] sysrq: Power Off [ 159s] [ 146.654352] reboot: Power down [ 159s] ### VM INTERACTION END ### [ 159s] [ 159s] lamb71 failed "build simtrace2_0.7.0.69.aadd.dsc" at Tue Nov 3 01:38:26 UTC 2020. [ 159s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/simtrace2 in xUbuntu_20.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/xUbuntu_20.04/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in xUbuntu_20.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 111s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 111s] [COMPILING libboard/qmod/source/card_pres.c] [ 111s] [COMPILING libboard/qmod/source/wwan_led.c] [ 111s] [COMPILING libboard/qmod/source/i2c.c] [ 111s] [COMPILING libboard/qmod/source/board_qmod.c] [ 111s] [COMPILING apps/dfu/main.c] [ 111s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 111s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 111s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 112s] Memory region Used Size Region Size %age Used [ 112s] rom: 16588 B16 KB101.25% [ 112s] ram: 11672 B48 KB 23.75/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: bin/qmod-dfu-flash.elf section `.text' will not fit in region `rom' [ 112s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 204 bytes [ 112s] collect2: error: ld returned 1 exit status [ 112s] % [ 112s] make[2]: *** [Makefile:234: flash] Error 1 [ 112s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 112s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 112s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 112s] dh_auto_build: error: make -j1 returned exit code 2 [ 112s] make: *** [debian/rules:16: build] Error 25 [ 112s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 112s] ### VM INTERACTION START ### [ 115s] [ 105.606353] sysrq: Power Off [ 115s] [ 105.610606] reboot: Power down [ 115s] ### VM INTERACTION END ### [ 115s] [ 115s] sheep87 failed "build simtrace2_0.7.0.69.aadd.dsc" at Tue Nov 3 01:37:32 UTC 2020. [ 115s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-bts[master]: fixup: vty: call bts_model_vty_init() from bts_vty_init()
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21027 ) Change subject: fixup: vty: call bts_model_vty_init() from bts_vty_init() .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I262c39896b5db86c54ad9aa7042c7ca6657815d9 Gerrit-Change-Number: 21027 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: dexter Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 02 Nov 2020 22:54:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: fixup: vty: call bts_model_vty_init() from bts_vty_init()
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21027 ) Change subject: fixup: vty: call bts_model_vty_init() from bts_vty_init() .. fixup: vty: call bts_model_vty_init() from bts_vty_init() Now bts_model_vty_init() must be called only once, otherwise the process would crash when bts_model_init() is called from main(). Change-Id: I262c39896b5db86c54ad9aa7042c7ca6657815d9 Related: SYS#4937, OS#3036 --- M src/osmo-bts-litecell15/main.c M src/osmo-bts-oc2g/main.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/main.c M src/osmo-bts-trx/main.c M src/osmo-bts-virtual/main.c 6 files changed, 0 insertions(+), 12 deletions(-) Approvals: dexter: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/src/osmo-bts-litecell15/main.c b/src/osmo-bts-litecell15/main.c index e29efd5..985d7db 100644 --- a/src/osmo-bts-litecell15/main.c +++ b/src/osmo-bts-litecell15/main.c @@ -112,8 +112,6 @@ bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP); - bts_model_vty_init(bts); - return 0; } diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c index 9b0ebec..12c489f 100644 --- a/src/osmo-bts-oc2g/main.c +++ b/src/osmo-bts-oc2g/main.c @@ -113,8 +113,6 @@ bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP); - bts_model_vty_init(bts); - return 0; } diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index 4dc399e..f69a535 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -781,8 +781,6 @@ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1); osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1); - bts_model_vty_init(bts); - return 0; } diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index 9befcda..2057a05 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -80,8 +80,6 @@ bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP); bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB); - bts_model_vty_init(bts); - return 0; } diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 166af7e..021c3c7 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -147,8 +147,6 @@ bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB); - bts_model_vty_init(bts); - return 0; } diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index e5b7206..e5e44ed 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -70,8 +70,6 @@ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR); osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH); - bts_model_vty_init(bts); - return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I262c39896b5db86c54ad9aa7042c7ca6657815d9 Gerrit-Change-Number: 21027 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-MessageType: merged
Change in osmo-bts[master]: fixup: vty: call bts_model_vty_init() from bts_vty_init()
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/21027 ) Change subject: fixup: vty: call bts_model_vty_init() from bts_vty_init() .. fixup: vty: call bts_model_vty_init() from bts_vty_init() Now bts_model_vty_init() must be called only once, otherwise the process would crash when bts_model_init() is called from main(). Change-Id: I262c39896b5db86c54ad9aa7042c7ca6657815d9 Related: SYS#4937, OS#3036 --- M src/osmo-bts-litecell15/main.c M src/osmo-bts-oc2g/main.c M src/osmo-bts-octphy/l1_if.c M src/osmo-bts-sysmo/main.c M src/osmo-bts-trx/main.c M src/osmo-bts-virtual/main.c 6 files changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/27/21027/1 diff --git a/src/osmo-bts-litecell15/main.c b/src/osmo-bts-litecell15/main.c index e29efd5..985d7db 100644 --- a/src/osmo-bts-litecell15/main.c +++ b/src/osmo-bts-litecell15/main.c @@ -112,8 +112,6 @@ bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP); - bts_model_vty_init(bts); - return 0; } diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c index 9b0ebec..12c489f 100644 --- a/src/osmo-bts-oc2g/main.c +++ b/src/osmo-bts-oc2g/main.c @@ -113,8 +113,6 @@ bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP); - bts_model_vty_init(bts); - return 0; } diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c index 4dc399e..f69a535 100644 --- a/src/osmo-bts-octphy/l1_if.c +++ b/src/osmo-bts-octphy/l1_if.c @@ -781,8 +781,6 @@ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_F_V1); osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_V1); - bts_model_vty_init(bts); - return 0; } diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index 9befcda..2057a05 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -80,8 +80,6 @@ bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MS_PWR_CTRL_DSP); bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB); - bts_model_vty_init(bts); - return 0; } diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index 166af7e..021c3c7 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -147,8 +147,6 @@ bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB); - bts_model_vty_init(bts); - return 0; } diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c index e5b7206..e5e44ed 100644 --- a/src/osmo-bts-virtual/main.c +++ b/src/osmo-bts-virtual/main.c @@ -70,8 +70,6 @@ osmo_bts_set_feature(bts->features, BTS_FEAT_SPEECH_H_AMR); osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH); - bts_model_vty_init(bts); - return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I262c39896b5db86c54ad9aa7042c7ca6657815d9 Gerrit-Change-Number: 21027 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-gsm-manuals[master]: Makefile.docbook.inc: generate *.pdf in the given directory
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/21026 ) Change subject: Makefile.docbook.inc: generate *.pdf in the given directory .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/21026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: If6d19dd0359239582d41ab3577c4b8bada4c81b8 Gerrit-Change-Number: 21026 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 20:31:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: Makefile.docbook.inc: generate *.pdf in the given directory
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/21026 ) Change subject: Makefile.docbook.inc: generate *.pdf in the given directory .. Makefile.docbook.inc: generate *.pdf in the given directory Change-Id: If6d19dd0359239582d41ab3577c4b8bada4c81b8 Related: SYS#4937 --- M build/Makefile.docbook.inc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/26/21026/1 diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index 22e9bb4..eb0ee25 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -38,5 +38,5 @@ # xslt path: find includes in both $(OSMO_GSM_MANUALS_DIR)/common/chapters and $(builddir)/generated %.pdf: %.xml %.xml-lint $(DOCBOOKS_DEPS) build common dblatex --xslt-opts="--path $(realpath $(OSMO_GSM_MANUALS_DIR))/common/chapters:$(INC_DIR)" \ - $(dblatex_quiet) -P draft.mode=no -o $(notdir $@) $< + $(dblatex_quiet) -P draft.mode=no -o $@ $< -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/21026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: If6d19dd0359239582d41ab3577c4b8bada4c81b8 Gerrit-Change-Number: 21026 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: pcu: Add infra to handle multitrx and multits envs
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20968 ) Change subject: pcu: Add infra to handle multitrx and multits envs .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20968/2/pcu/GPRS_Components.ttcn File pcu/GPRS_Components.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20968/2/pcu/GPRS_Components.ttcn@370 PS2, Line 370: inout > in (a.k.a. […] I think the object is then copied, because you can still call "f_ultbf_next_ts(ms.ul_tbf);" which uses an inout. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20968 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: I28430e6d8c77d2b7dc630d186d425a5d82587b82 Gerrit-Change-Number: 20968 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 19:36:58 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967 ) Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase .. Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967/3/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967/3/pcu/PCU_Tests.ttcn@1169 PS3, Line 1169: var PollFnCtx pollctx; > Idea: I think it would be really nice to make this part of GprsMs, so there > would be no need to mess […] I also thought about that, the problem is that not always one wants to do the same steps and not in the same order, so you may want to tx/rx something before using the poll, etc. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967/3/pcu/PCU_Tests.ttcn@1201 PS3, Line 1201: nr := pollctx.tstrxbts > unrelated? Not really, it's related to the new feature/code being added above. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967 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: Ie0035bab79c286a968394d7b724d975f43d187ce Gerrit-Change-Number: 20967 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 19:36:50 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-bts[master]: main: do not print asciiart to stdout, use stderr instead
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20953 ) Change subject: main: do not print asciiart to stdout, use stderr instead .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5c35f36fdd2a8a80bd501b996f0b161c388d3510 Gerrit-Change-Number: 20953 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 19:20:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: doc/manuals: also generate VTY reference for osmo-bts-virtual
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21025 ) Change subject: doc/manuals: also generate VTY reference for osmo-bts-virtual .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I12ac8cc13ce0caea2b63f94c407c01b4f00845e5 Gerrit-Change-Number: 21025 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 19:20:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: sched_lchan_tchh: redirect FACCH measurements via BFI TCH indication
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21024 ) Change subject: sched_lchan_tchh: redirect FACCH measurements via BFI TCH indication .. Patch Set 1: This is still not what I meant, sorry. I'll propose the code tomorrow, if you don't mind. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib1f0dfe4cb03a356254503abf51e9f27d0dd2179 Gerrit-Change-Number: 21024 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 02 Nov 2020 19:03:39 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: main: do not print asciiart to stdout, use stderr instead
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20953 ) Change subject: main: do not print asciiart to stdout, use stderr instead .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5c35f36fdd2a8a80bd501b996f0b161c388d3510 Gerrit-Change-Number: 20953 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 18:57:13 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: doc/manuals: also generate VTY reference for osmo-bts-virtual
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/21025 ) Change subject: doc/manuals: also generate VTY reference for osmo-bts-virtual .. doc/manuals: also generate VTY reference for osmo-bts-virtual Change-Id: I12ac8cc13ce0caea2b63f94c407c01b4f00845e5 Related: SYS#4937, OS#3036 --- M doc/manuals/Makefile.am 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/25/21025/1 diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am index 2fd21e6..40b77c8 100644 --- a/doc/manuals/Makefile.am +++ b/doc/manuals/Makefile.am @@ -18,7 +18,8 @@ osmobts-abis.pdf: $(srcdir)/abis/*.adoc $(srcdir)/abis/*.msc rtp-amr.pdf: $(srcdir)/dtx.dot - VARIANTS = $(NULL) + # NOTE: osmo-bts-omldummy has no VTY interface + VARIANTS = virtual if ENABLE_SYSMOBTS VARIANTS += sysmo -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I12ac8cc13ce0caea2b63f94c407c01b4f00845e5 Gerrit-Change-Number: 21025 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: print the final result to stdout
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/20952 )
Change subject: vty_reference_combine.sh: print the final result to stdout
..
vty_reference_combine.sh: print the final result to stdout
This is a follow-up change for [1], making this script more
flexible. It's now a task of the caller to store the merge
results to a file. This approach allows to merge several
*.xml files and store all the results in a single directory.
Unfortunately, it's impossible to pass the same file as both
input and output to xsltproc, because it would immediately
overwrite its input. To work this around, create two
temporary files and remove them at the end of the script.
[1] Iabe729af22c235cf9c4b252acda99b43ebcae20c
Change-Id: I6aac73d998c5937894233631e654a160d5623198
Related: SYS#4937
---
M build/Makefile.vty-reference.inc
M build/vty_reference_combine.sh
2 files changed, 18 insertions(+), 17 deletions(-)
Approvals:
Jenkins Builder: Verified
Hoernchen: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
diff --git a/build/Makefile.vty-reference.inc b/build/Makefile.vty-reference.inc
index 9e22925..878c841 100644
--- a/build/Makefile.vty-reference.inc
+++ b/build/Makefile.vty-reference.inc
@@ -79,7 +79,7 @@
$(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \
$$($(OSMO_GSM_MANUALS_DIR)/build/find_existing_path.sh
"vty/*reference.xml" $(builddir) $(srcdir)) \
$(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \
- $(srcdir)/vty/*additions*.xml
+ $(srcdir)/vty/*additions*.xml > $(GEN_DIR)/combined.xml
xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl
$(GEN_DIR)/combined.xml \
> $(GEN_DIR)/docbook_vty.xml
@@ -98,5 +98,5 @@
$(OSMO_GSM_MANUALS_DIR)/build/vty_reference_combine.sh "$(MERGE_DOC)" \
$$($(OSMO_GSM_MANUALS_DIR)/build/find_existing_path.sh
"*reference.xml" $$VTYDIR_BUILD $$VTYDIR_SRC) \
$(OSMO_GSM_MANUALS_DIR)/common/vty_additions.xml \
- $$VTYDIR_SRC/*additions*.xml && \
+ $$VTYDIR_SRC/*additions*.xml > $$VTYGEN/combined.xml && \
xsltproc $(OSMO_GSM_MANUALS_DIR)/vty_reference.xsl
$$VTYGEN/combined.xml > "$@"
diff --git a/build/vty_reference_combine.sh b/build/vty_reference_combine.sh
index 11e84c0..7b19758 100755
--- a/build/vty_reference_combine.sh
+++ b/build/vty_reference_combine.sh
@@ -1,12 +1,9 @@
#!/bin/sh
# usage: vty_reference_combine.sh path/to/merge_doc.xsl path/to/*reference.xml
[paths to additional xmls]
+# the result of combination is printed to stdout
# see Makefile.vty-reference.inc
set -e
-# Allow overriding the "generated" output dir, so we don't have collisions
when building multiple VTY references in one
-# Osmocom project (OS#4292)
-VTYGEN=${VTYGEN:-generated}
-
# first argument: merge_doc.xsl
MERGE_DOC="$1"
shift
@@ -16,25 +13,29 @@
test "$(ls -1 $reference | wc -l)" = "1"
shift
-combined="$VTYGEN/combined.xml"
-combine_src="$VTYGEN/combine_src.xml"
-
set -x
-cp $reference "$combined"
+
+# we cannot use the same file as input and output, because
+# xsltproc would override the input immediately :/
+combined=$(mktemp)
+combine_src=$(mktemp)
+cp $reference $combined
while [ -n "$1" ]; do
addition="$(realpath "$1")"
shift
- # Fix permissions: xsltproc sets the output permissions the same as the
- # input file, which means during "make distcheck" our output file will
- # become read-only.
- if [ -f "$combine_src" ]; then
- chmod 644 "$combine_src"
- fi
+ # sync both input and output files
+ cp $combined $combine_src
- mv "$combined" "$combine_src"
xsltproc -o "$combined" \
--stringparam with "$addition" \
"$MERGE_DOC" "$combine_src"
done
+
+# print the results to stdout
+cat $combined >&1
+
+# clean up temporary files
+rm -f $combine_src
+rm -f $combined
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/20952
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Change-Id: I6aac73d998c5937894233631e654a160d5623198
Gerrit-Change-Number: 20952
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-manuals[master]: vty_reference_combine.sh: print the final result to stdout
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/20952 ) Change subject: vty_reference_combine.sh: print the final result to stdout .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/20952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I6aac73d998c5937894233631e654a160d5623198 Gerrit-Change-Number: 20952 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 18:50:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: sched_lchan_tchh: redirect FACCH measurements via BFI TCH indication
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21024 ) Change subject: sched_lchan_tchh: redirect FACCH measurements via BFI TCH indication .. Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/21024/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/21024/1//COMMIT_MSG@9 PS1, Line 9: FACCH FACCH/H https://gerrit.osmocom.org/c/osmo-bts/+/21024/1//COMMIT_MSG@9 PS1, Line 9: TCH TCH/H https://gerrit.osmocom.org/c/osmo-bts/+/21024/1//COMMIT_MSG@11 PS1, Line 11: Those indications carry no : measurement results. Why is that? Of course they do, and this is why you submitted a patch setting 'rssi' to 0 for FACCH/F. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib1f0dfe4cb03a356254503abf51e9f27d0dd2179 Gerrit-Change-Number: 21024 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 02 Nov 2020 18:47:42 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: measurement: account FACCH/H uplink measurements correctly
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20980 ) Change subject: measurement: account FACCH/H uplink measurements correctly .. Patch Set 2: > Patch Set 1: > > My assumption was wrong, we already do send to BFIs in the current > implementation: > > https://gerrit.osmocom.org/c/osmo-bts/+/20981 osmo-bts-trx/scheduler: fix > comments related to FACCH/H and BFI > > so why would we end up with one measurement sample less then? I guess the > problem is that one such BFI is ignored by the measurement logic as expected, > while another one is not, because it holds a valid RSSI value? During the > last call, I proposed to ignore the measurement samples carried by BFIs > triggered by FACCH, but what if we take the opposite approach and ignore > FACCH samples instead? In other words, you count speech frames as usual, > including all BFIs, but do not take FACCH samples into account. This way > there would be need to mess up with expected number of measurements, it would > always be constant. And of course, this is only in speech mode. In > signalling, we count FACCH frames as usual. What do you think? I think your idea worked out. I have now BTS_Tests.TC_meas_res_speech_tchh_facch passing. See also: https://gerrit.osmocom.org/c/osmo-bts/+/21024 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibf693aede8fffa6432cdcdcf5d52910493a1104b Gerrit-Change-Number: 20980 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 18:40:11 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: sched_lchan_tchh: redirect FACCH measurements via BFI TCH indication
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/21024 )
Change subject: sched_lchan_tchh: redirect FACCH measurements via BFI TCH
indication
..
sched_lchan_tchh: redirect FACCH measurements via BFI TCH indication
A FACCH block is spread over 6 frames. This means that two TCH blocks
are skipped in favor of the FACCH. In speach mode the missing TCH blocks
will emit a TCH indication anyway. Those indications carry no
measurement results. Unfortunately the anpredictable behaviour of the
FACCH and the asymetric block sizes create an uneaven stream of
measurement results which makes processing of the measurement results
rather difficult. However, the processing of the measurement results can
be simplified when we even out the measurement results by redirecting
the FACCH measurements via BFI TCH indications.
Change-Id: Ib1f0dfe4cb03a356254503abf51e9f27d0dd2179
Related: OS#4799
---
M include/osmo-bts/scheduler.h
M src/osmo-bts-trx/sched_lchan_tchh.c
2 files changed, 37 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/21024/1
diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h
index 6bb0b9b..2536609 100644
--- a/include/osmo-bts/scheduler.h
+++ b/include/osmo-bts/scheduler.h
@@ -114,6 +114,7 @@
/* TCH/H */
uint8_t dl_ongoing_facch; /* FACCH/H on downlink */
uint8_t ul_ongoing_facch; /* FACCH/H on uplink */
+ struct l1sched_meas_set meas_avg_facch; /* Last FACCH/H measurement
sample */
/* encryption */
int ul_encr_algo; /* A5/x encry algo downlink */
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c
b/src/osmo-bts-trx/sched_lchan_tchh.c
index c7dac70..85c8a25 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -71,6 +71,7 @@
uint16_t ber10k;
uint8_t is_sub = 0;
uint8_t ft;
+ bool redirect_facch_meas = false;
/* If handover RACH detection is turned on, treat this burst as an
Access Burst.
* Handle NOPE.ind as usually to ensure proper Uplink measurement
reporting. */
@@ -128,6 +129,11 @@
* was decoded (see below), now send the second one. */
ber10k = 0;
memset(&meas_avg, 0, sizeof(meas_avg));
+ /* Redirect FACCH measurement values via BFI TCH indications.
+* this is only valid for SPEECH mode, since in SIGNALLING no
+* BFI TCH indications are generated. */
+ if (rsl_cmode == RSL_CMOD_SPD_SPEECH)
+ redirect_facch_meas = 1;
goto bfi;
}
@@ -262,6 +268,17 @@
fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_FACCH_H0);
else
fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_FACCH_H1);
+
+ /* (see also note above). We backup the measurement values we
received
+* with the FACCH/H, then we invalidate the measurement value,
so that
+* the higher layers will not count the measurement value we
hand over
+* with the FACCH DATA indication. */
+ if (rsl_cmode == RSL_CMOD_SPD_SPEECH) {
+ memcpy(&chan_state->meas_avg_facch, &meas_avg,
sizeof(chan_state->meas_avg_facch));
+ meas_avg.rssi = 0;
+ redirect_facch_meas = 1;
+ }
+
_sched_compose_ph_data_ind(l1t, bi->tn, fn_begin, chan,
tch_data + amr, GSM_MACBLOCK_LEN,
meas_avg.rssi, meas_avg.toa256,
@@ -326,10 +343,25 @@
fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_H0);
else
fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_H1);
- return _sched_compose_tch_ind(l1t, bi->tn, fn_begin, chan, tch_data, rc,
- /* FIXME: what should we use for BFI
here? */
- bfi_flag ? bi->toa256 : meas_avg.toa256,
ber10k,
- bfi_flag ? bi->rssi : meas_avg.rssi,
is_sub);
+
+ /* Use measurement values from the last FACCH transmission instead of
+* the current one. This is only done when a previous FACCH transmission
+* took out two TCH voice blocks. To maintain a constant stream of
+* measurement values we redirect the measurement values we have
+* received with the FACCH to the two replacement BFI TCH indications.
*/
+ if(redirect_facch_meas)
+ memcpy(&meas_avg, &chan_state->meas_avg_facch,
sizeof(chan_state->meas_avg_facch));
+
+ rc = _sched_compose_tch_ind(l1t, bi->tn, fn_begin, chan, tch_data, rc,
+ /* FIXME: what should we use for BFI here?
*/
+
Change in osmo-bts[master]: vty: call bts_model_vty_init() from bts_vty_init()
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/21011 )
Change subject: vty: call bts_model_vty_init() from bts_vty_init()
..
vty: call bts_model_vty_init() from bts_vty_init()
Similar to bts_vty_init(), BTS specific bts_model_vty_init()
requires a pointer to 'struct gsm_bts'. Not only it's used
as a parent talloc context, but also stored locally, so then
it can be used by some VTY commands.
Let's expose the global 'struct gsm_bts' from main, and pass
the application's talloc context like was done in [1].
This finally makes the BTS model specific options appear in
the automatically generated VTY reference (--vty-ref-xml).
[1] Ic356a950da85de02c82e9882a5fbadaaa6929680
Change-Id: Iee7fee6747dd1e7c0af36f9b27326f651ae37aaf
Related: SYS#4937, OS#3036
---
M include/osmo-bts/bts_model.h
M include/osmo-bts/vty.h
M src/common/main.c
M src/common/vty.c
M src/osmo-bts-litecell15/lc15bts_vty.c
M src/osmo-bts-oc2g/oc2gbts_vty.c
M src/osmo-bts-octphy/octphy_vty.c
M src/osmo-bts-sysmo/sysmobts_vty.c
M src/osmo-bts-trx/trx_vty.c
M src/osmo-bts-virtual/virtualbts_vty.c
10 files changed, 67 insertions(+), 89 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/include/osmo-bts/bts_model.h b/include/osmo-bts/bts_model.h
index 568ff00..ef93fda 100644
--- a/include/osmo-bts/bts_model.h
+++ b/include/osmo-bts/bts_model.h
@@ -34,7 +34,7 @@
/* Implementation should call bts_model_trx_close_cb when done */
void bts_model_trx_close(struct gsm_bts_trx *trx);
-int bts_model_vty_init(struct gsm_bts *bts);
+int bts_model_vty_init(void *ctx);
void bts_model_config_write_bts(struct vty *vty, const struct gsm_bts *bts);
void bts_model_config_write_trx(struct vty *vty, const struct gsm_bts_trx
*trx);
diff --git a/include/osmo-bts/vty.h b/include/osmo-bts/vty.h
index c9840d1..c815c85 100644
--- a/include/osmo-bts/vty.h
+++ b/include/osmo-bts/vty.h
@@ -27,6 +27,7 @@
struct gsm_network *gsmnet_from_vty(struct vty *v);
extern struct vty_app_info bts_vty_info;
+extern struct gsm_bts *g_bts;
enum bts_vty_cmd_attr {
BTS_VTY_ATTR_NEW_LCHAN,
diff --git a/src/common/main.c b/src/common/main.c
index 67aeff3..102bf88 100644
--- a/src/common/main.c
+++ b/src/common/main.c
@@ -211,7 +211,8 @@
}
}
-static struct gsm_bts *bts;
+/* FIXME: remove this once we add multi-BTS support */
+struct gsm_bts *g_bts = NULL;
static void signal_handler(int signal)
{
@@ -221,10 +222,10 @@
case SIGINT:
case SIGTERM:
if (!quit) {
- oml_tx_failure_event_rep(&bts->mo,
+ oml_tx_failure_event_rep(&g_bts->mo,
NM_SEVER_CRITICAL,
OSMO_EVT_CRIT_PROC_STOP,
"BTS: SIGINT received ->
shutdown");
- bts_shutdown(bts, "SIGINT");
+ bts_shutdown(g_bts, "SIGINT");
}
quit++;
break;
@@ -288,8 +289,8 @@
handle_options(argc, argv);
- bts = gsm_bts_alloc(tall_bts_ctx, 0);
- if (!bts) {
+ g_bts = gsm_bts_alloc(tall_bts_ctx, 0);
+ if (!g_bts) {
fprintf(stderr, "Failed to create BTS structure\n");
exit(1);
}
@@ -317,12 +318,12 @@
gsmtap_source_add_sink(gsmtap);
}
- if (bts_init(bts) < 0) {
+ if (bts_init(g_bts) < 0) {
fprintf(stderr, "unable to open bts\n");
exit(1);
}
- abis_init(bts);
+ abis_init(g_bts);
rc = vty_read_config_file(config_file, NULL);
if (rc < 0) {
@@ -336,7 +337,7 @@
exit(1);
}
- llist_for_each_entry(trx, &bts->trx_list, list) {
+ llist_for_each_entry(trx, &g_bts->trx_list, list) {
if (!trx->role_bts.l1h) {
fprintf(stderr, "TRX %u has no associated PHY
instance\n",
trx->nr);
@@ -346,7 +347,7 @@
write_pid_file("osmo-bts");
- bts_controlif_setup(bts, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_BTS);
+ bts_controlif_setup(g_bts, ctrl_vty_get_bind_addr(),
OSMO_CTRL_PORT_BTS);
rc = telnet_init_dynif(tall_bts_ctx, NULL, vty_get_bind_addr(),
g_vty_port_num);
@@ -355,7 +356,7 @@
exit(1);
}
- if (pcu_sock_init(bts->pcu.sock_path)) {
+ if (pcu_sock_init(g_bts->pcu.sock_path)) {
fprintf(stderr, "PCU L1 socket failed\n");
exit(1);
}
@@ -367,12 +368,12 @@
signal(SIGUSR2, &signal_handler);
osmo_init_ignore_signals();
- if (!bts->bsc_oml_host) {
+ if (!g_bts->bsc_oml_host) {
fprintf(stderr, "Cannot start BTS without know
Change in osmo-bts[master]: measurement.c: fix integer overflow problem
dexter has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/20979 )
Change subject: measurement.c: fix integer overflow problem
..
measurement.c: fix integer overflow problem
The variables num_meas_sub_expect - num_meas_sub must not be subtracted
without prior checking. Depending on the input (which might be
errornous), num_meas_sub might be greater then num_meas_sub_expect. This
eventually leads into odd behavior, which can be difficult to debug.
Change-Id: I381cc637d1c125f279ccf88db114609946fe24fe
Related: OS#4799
---
M src/common/measurement.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/common/measurement.c b/src/common/measurement.c
index d5c3ee0..3813658 100644
--- a/src/common/measurement.c
+++ b/src/common/measurement.c
@@ -642,7 +642,7 @@
* negotiated in AMR, so we can not know if and how many
* SUB frames are missing. */
if (lchan->tch_mode != GSM48_CMODE_SPEECH_AMR) {
- if (num_ul_meas_expect - i <=
num_meas_sub_expect - num_meas_sub) {
+ if (num_meas_sub <= i) {
num_meas_sub_subst++;
is_sub = true;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20979
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I381cc637d1c125f279ccf88db114609946fe24fe
Gerrit-Change-Number: 20979
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: measurement.c: fix integer overflow problem
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20979 ) Change subject: measurement.c: fix integer overflow problem .. Patch Set 2: Thanks for verifying! -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I381cc637d1c125f279ccf88db114609946fe24fe Gerrit-Change-Number: 20979 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 18:04:48 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-gsm-manuals[master]: Makefile.docbook.inc: allow to re-define the include directory
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/20985 ) Change subject: Makefile.docbook.inc: allow to re-define the include directory .. Makefile.docbook.inc: allow to re-define the include directory Change-Id: I08481319bbe14c3f45bf38bafa478de239751400 Related: SYS#4937 --- M build/Makefile.docbook.inc 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/build/Makefile.docbook.inc b/build/Makefile.docbook.inc index 655ff58..22e9bb4 100644 --- a/build/Makefile.docbook.inc +++ b/build/Makefile.docbook.inc @@ -27,6 +27,9 @@ all: $(DOCBOOKS_PDF) +# Allow the users to re-define the include directory +INC_DIR ?= $(PWD)/generated + # Lint the file %.xml-lint: %.xml xmllint --xinclude --postvalid --noout $< @@ -34,6 +37,6 @@ # Create a PDF file and lint it before # xslt path: find includes in both $(OSMO_GSM_MANUALS_DIR)/common/chapters and $(builddir)/generated %.pdf: %.xml %.xml-lint $(DOCBOOKS_DEPS) build common - dblatex --xslt-opts="--path $(realpath $(OSMO_GSM_MANUALS_DIR))/common/chapters:$$PWD/generated" \ + dblatex --xslt-opts="--path $(realpath $(OSMO_GSM_MANUALS_DIR))/common/chapters:$(INC_DIR)" \ $(dblatex_quiet) -P draft.mode=no -o $(notdir $@) $< -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/20985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I08481319bbe14c3f45bf38bafa478de239751400 Gerrit-Change-Number: 20985 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-pcu[master]: tbf_dl: Don't fake EGPRS MS class when no related info is available
Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20936 to look at the new patch set (#5). Change subject: tbf_dl: Don't fake EGPRS MS class when no related info is available .. tbf_dl: Don't fake EGPRS MS class when no related info is available For instance if PCU received DL data to be sent to an MS from an SGSN, and the MS is not currently cached in the PCU (because there's no TBF active for it), it will page it and transmit the DL data to it. The SGSN is capable of sending (EGPRS) MS Class information in that same DL data message, so it's the one responsible for providing that information if not available at the PCU. In the PCU if we don't have information about that MS and SGSN didn't provide us information about it, we cannot assume the MS is going to be EGPRS capable and even less expecting a specific EGPRS MS class. So let's drop this code. Related: OS#4544 Change-Id: Icce66cadb51af25ae0c3b3719940eccb548fe33b --- M src/tbf_dl.cpp M tests/tbf/TbfTest.cpp M tests/tbf/TbfTest.err 3 files changed, 22 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/36/20936/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icce66cadb51af25ae0c3b3719940eccb548fe33b Gerrit-Change-Number: 20936 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: Get rid of bts->egprs_enabled
Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20994 to look at the new patch set (#3). Change subject: Get rid of bts->egprs_enabled .. Get rid of bts->egprs_enabled BTS simply notifies the PCU about the supported MCS, and PCU is responsible for providing correct data formatting supported for the BTS and the target MS. Related: OS#4544 Change-Id: Ifcf23771bd23afc64ca6fea38948f98f2d134ecb --- M src/bts.h M src/gprs_bssgp_pcu.cpp M src/pcu_l1_if.cpp M tests/edge/EdgeTest.cpp M tests/tbf/TbfTest.cpp M tests/types/TypesTest.cpp 6 files changed, 17 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/94/20994/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifcf23771bd23afc64ca6fea38948f98f2d134ecb Gerrit-Change-Number: 20994 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: tbf_ul: Allow non-egprs phones if EGPRS is enabled
Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20993 to look at the new patch set (#3). Change subject: tbf_ul: Allow non-egprs phones if EGPRS is enabled .. tbf_ul: Allow non-egprs phones if EGPRS is enabled We'll be able to still serve GPRS-only phones if EGPRS is enabled. Related: OS#4544 Change-Id: I2e01b9d0de7506e0c0960342d73dba29187fe61f --- M src/bts.h M src/tbf_ul.cpp 2 files changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/93/20993/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2e01b9d0de7506e0c0960342d73dba29187fe61f Gerrit-Change-Number: 20993 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: pdch: Process received CS1-4 data blocks regardless of egprs_enabled
Hello Jenkins Builder, laforge, fixeria, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20929 to look at the new patch set (#6). Change subject: pdch: Process received CS1-4 data blocks regardless of egprs_enabled .. pdch: Process received CS1-4 data blocks regardless of egprs_enabled EGPRS "enabled" or "not enabled" is a bit of confusing idea, since there are different levels of EGPRS support. For instance we may have been instructed by config to not transmit using MCS5-9 (8PSK), or not use MCS1-9 at all (GMSK+8PSK). However, we cannot control what is sent to us or what we receive on lower layers, so if the BTS PHY/receiver was able to decode+receive, let's try to process it anyway... Related: OS#4544 Change-Id: Ie70ec8e4a2d688762d7d320d6ad58d5a0cc52ea1 --- M src/pdch.cpp 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/29/20929/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie70ec8e4a2d688762d7d320d6ad58d5a0cc52ea1 Gerrit-Change-Number: 20929 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase
Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967 to look at the new patch set (#4). Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase .. pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_2phase Change-Id: Ie0035bab79c286a968394d7b724d975f43d187ce --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 103 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/20967/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20967 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: Ie0035bab79c286a968394d7b724d975f43d187ce Gerrit-Change-Number: 20967 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: pcu: prepare tests for new GPRS/EGPRS multiplex support
Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20984 to look at the new patch set (#2). Change subject: pcu: prepare tests for new GPRS/EGPRS multiplex support .. pcu: prepare tests for new GPRS/EGPRS multiplex support Once GPRS/EGPRS multiplexed support is ready, it will be controlled through pcu info_ind.flags by enabling MCS or not; the "egprs only" VTY comamnd will be dropped. The usual setup would be to support both GPRS+EGPRS, so make that the default. Most tests require to be passed the _noMCS variant to work in older versions of PCU, since those versions use the "egprs only" concept which will reject egprs_ms_class=0. Same tests enabling MCS in newer osmo-pcu shouldn't be a problem. Related: OS#4544 Change-Id: Ib95aae155b0712313a30f0c5404a8cb1f28b98f5 --- M library/PCUIF_Types.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 63 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/20984/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20984 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: Ib95aae155b0712313a30f0c5404a8cb1f28b98f5 Gerrit-Change-Number: 20984 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: pcu: Add infra to handle multitrx and multits envs
Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20968 to look at the new patch set (#3). Change subject: pcu: Add infra to handle multitrx and multits envs .. pcu: Add infra to handle multitrx and multits envs ARFCNs are allocated sequentially, so that conversion between arfcn<->trx_nr is easily done. Some helper functions are introduced to be able to submit and expect messages on a given TRX+TS, which is required for setups with several TRX and PDCH-enabled TS different than the default. These new APIs will be used in PCU_Tests.ttcn in subsequent patches. Change-Id: I28430e6d8c77d2b7dc630d186d425a5d82587b82 --- M library/PCUIF_Types.ttcn M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 3 files changed, 87 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/20968/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20968 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: I28430e6d8c77d2b7dc630d186d425a5d82587b82 Gerrit-Change-Number: 20968 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: vty: call bts_model_vty_init() from bts_vty_init()
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21011 ) Change subject: vty: call bts_model_vty_init() from bts_vty_init() .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iee7fee6747dd1e7c0af36f9b27326f651ae37aaf Gerrit-Change-Number: 21011 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 17:37:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn
Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 to look at the new patch set (#6). Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn .. pcu: Introduce test TC_dl_multislot_tbf_ms_class_from_sgsn Related: SYS#5131 Change-Id: I417953a4c89dec82500b3b66f08ed648d266d813 --- M pcu/PCU_Tests.ttcn 1 file changed, 58 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/20947/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20947 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: I417953a4c89dec82500b3b66f08ed648d266d813 Gerrit-Change-Number: 20947 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: vty: call bts_model_vty_init() from bts_vty_init()
laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21011 ) Change subject: vty: call bts_model_vty_init() from bts_vty_init() .. Removed Code-Review-1 by laforge -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iee7fee6747dd1e7c0af36f9b27326f651ae37aaf Gerrit-Change-Number: 21011 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote
Change in osmo-bts[master]: vty: call bts_model_vty_init() from bts_vty_init()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21011 ) Change subject: vty: call bts_model_vty_init() from bts_vty_init() .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iee7fee6747dd1e7c0af36f9b27326f651ae37aaf Gerrit-Change-Number: 21011 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 17:35:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf_dl: Don't fake EGPRS MS class when no related info is available
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20936 ) Change subject: tbf_dl: Don't fake EGPRS MS class when no related info is available .. Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20936/3/src/tbf_dl.cpp File src/tbf_dl.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20936/3/src/tbf_dl.cpp@a134 PS3, Line 134: LOGP(DTBF, LOGL_NOTICE, "Not accepting non-EGPRS phone in EGPRS-only mode\n"); : bts->bts->do_rate_ctr_inc(CTR_TBF_FAILED_EGPRS_ONLY); : return NULL; > did we reach "the moment" before this patch? Then yes, it can be removed. […] "The moment" is not yet there, but we are simply missing the part where we downgrade a DL msg to MCS1-4 in case the USF to send relates toa TBF from an MS not supporting EGPRS. And in any case, dropping this code doesn't make worse the current situation. It acutally makes the situation better since it will allow GPRS-only MS and they will work as long as other MS don't use MCS-48 on the same PDCH slot. So let's go for getting rid of this "egprs" flag and fix specific issues later on. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icce66cadb51af25ae0c3b3719940eccb548fe33b Gerrit-Change-Number: 20936 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 17:34:26 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf_ul: Allow non-egprs phones if EGPRS is enabled
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20993 ) Change subject: tbf_ul: Allow non-egprs phones if EGPRS is enabled .. Patch Set 2: > Patch Set 2: > > I still don't understand why we support this situation (GPRS compatibility > while EGPGRS enabled) now, Did I miss some patches? See my comment from previous patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2e01b9d0de7506e0c0960342d73dba29187fe61f Gerrit-Change-Number: 20993 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 17:35:08 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-trx[master]: doc/manuals: generate XML VTY reference at build-time
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20966 ) Change subject: doc/manuals: generate XML VTY reference at build-time .. Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I798ea3b7417b8ca3e9c7d50911158c5413526237 Gerrit-Change-Number: 20966 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 17:33:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-trx[master]: main: use logging API to print SIMD info instead of printf()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/20965 ) Change subject: main: use logging API to print SIMD info instead of printf() .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/20965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I8e0fd728d406e2452c9c0ddad5bce5f6b17fab42 Gerrit-Change-Number: 20965 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 17:33:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: measurement.c: fix integer overflow problem
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20979 ) Change subject: measurement.c: fix integer overflow problem .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I381cc637d1c125f279ccf88db114609946fe24fe Gerrit-Change-Number: 20979 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 17:31:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf_ul: Allow non-egprs phones if EGPRS is enabled
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20993 ) Change subject: tbf_ul: Allow non-egprs phones if EGPRS is enabled .. Patch Set 2: I still don't understand why we support this situation (GPRS compatibility while EGPGRS enabled) now, Did I miss some patches? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2e01b9d0de7506e0c0960342d73dba29187fe61f Gerrit-Change-Number: 20993 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 17:29:34 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcu[master]: Get rid of bts->egprs_enabled
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20994 ) Change subject: Get rid of bts->egprs_enabled .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifcf23771bd23afc64ca6fea38948f98f2d134ecb Gerrit-Change-Number: 20994 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 17:29:58 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: pdch: Drop error log line about egprs not enabled
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20929 ) Change subject: pdch: Drop error log line about egprs not enabled .. Patch Set 5: Ack I'll change the description. But in the ends its about both things (MS sends MCS1-9 and BTS PHY decodes and receives). -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie70ec8e4a2d688762d7d320d6ad58d5a0cc52ea1 Gerrit-Change-Number: 20929 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 02 Nov 2020 17:29:30 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcu[master]: tbf_dl: Don't fake EGPRS MS class when no related info is available
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20936 ) Change subject: tbf_dl: Don't fake EGPRS MS class when no related info is available .. Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20936/3/src/tbf_dl.cpp File src/tbf_dl.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20936/3/src/tbf_dl.cpp@a134 PS3, Line 134: LOGP(DTBF, LOGL_NOTICE, "Not accepting non-EGPRS phone in EGPRS-only mode\n"); : bts->bts->do_rate_ctr_inc(CTR_TBF_FAILED_EGPRS_ONLY); : return NULL; > Because this constraint in this code path makes no sense at the moment we > support both EGPRS and GPR […] did we reach "the moment" before this patch? Then yes, it can be removed. If we did not reach "the moment" yet, it must remain. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icce66cadb51af25ae0c3b3719940eccb548fe33b Gerrit-Change-Number: 20936 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 17:28:43 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-pcu[master]: pdch: Drop error log line about egprs not enabled
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20929 ) Change subject: pdch: Drop error log line about egprs not enabled .. Patch Set 5: it's not just dropping the log line, but also continues processing such blocks, so the log line is misleading. Also, as I stated in the previous review comment, it is less about what the MS sends, but more bout what the TRX/BTS UL PHY/receiver was able to decode+receive. If it has successfully decoded something, we should process it. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie70ec8e4a2d688762d7d320d6ad58d5a0cc52ea1 Gerrit-Change-Number: 20929 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Mon, 02 Nov 2020 17:27:48 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-pcu[master]: Enable egprs support through PCUIF from BTS/BSC
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20928 ) Change subject: Enable egprs support through PCUIF from BTS/BSC .. Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 Gerrit-Change-Number: 20928 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 17:26:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Take into account BTS supported (M)CS values when retrieving the maximum
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20992 ) Change subject: Take into account BTS supported (M)CS values when retrieving the maximum .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2d3a8bbae2f9887400ce56d2f8303ea30abaecfa Gerrit-Change-Number: 20992 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 17:25:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: prepare tests for new GPRS/EGPRS multiplex support
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20984 ) Change subject: pcu: prepare tests for new GPRS/EGPRS multiplex support .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20984/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20984/1/pcu/PCU_Tests.ttcn@70 PS1, Line 70: c_PCUIF_Flags_default > Most of the existing test cases are for GPRS, not EGPRS at the moment. […] The usual way of operation is going to be to support both GPRS and EGPRS concurrently, so I want to keep that the default. Passing c_PCUIF_Flags_noMCS to most tests is needed in order to avoid breakage with older versions of osmo-pcu (with "egprs only" flag) which will reject one phase RACH requests. So in fact with newer version of osmo-pcu, most of the test wouldn't care about using _default or not, but I need to keep those for a while to have -latest happy. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20984 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: Ib95aae155b0712313a30f0c5404a8cb1f28b98f5 Gerrit-Change-Number: 20984 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 02 Nov 2020 17:10:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_multislot_tbf_ms_class_from_2phase
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20983 ) Change subject: pcu: Introduce test TC_ul_multislot_tbf_ms_class_from_2phase .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20983/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20983/1/pcu/PCU_Tests.ttcn@1800 PS1, Line 1800: notify > 'indicate'? I prefer notify tbh, I see nothing wrong with it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20983 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: I26a3cc0f2bd7bab176aa52df3e40aca7300de216 Gerrit-Change-Number: 20983 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 17:07:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-pcu[master]: Move EGPRS MS mode set to gprs_ms.cpp
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20991 ) Change subject: Move EGPRS MS mode set to gprs_ms.cpp .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9d3ee21c765054a36bd22352e48bde5ffca9225a Gerrit-Change-Number: 20991 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 16:59:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: pcuif: Improve BTS-supported CS/MCS handling
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20990 ) Change subject: pcuif: Improve BTS-supported CS/MCS handling .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie8f0215ba17da1e545e98bec9325c02f1e8efaea Gerrit-Change-Number: 20990 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 16:59:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-pcu[master]: Move BTS initial values inside bts.cpp
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/21020 ) Change subject: Move BTS initial values inside bts.cpp .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/21020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iffd6eecb1f08bda0091f45e2ef7c9c63b42e10b3 Gerrit-Change-Number: 21020 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 16:58:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: ttcn3-testsuites: Set REGISTRY_HOST="registry.osmocom.org"
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/21021 ) Change subject: ttcn3-testsuites: Set REGISTRY_HOST="registry.osmocom.org" .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If4275cf3c8a5b70a67d742950a35ae8ead59a52e Gerrit-Change-Number: 21021 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 16:57:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: ttcn3-testsuites: Set REGISTRY_HOST="registry.osmocom.org"
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/21021 )
Change subject: ttcn3-testsuites: Set REGISTRY_HOST="registry.osmocom.org"
..
ttcn3-testsuites: Set REGISTRY_HOST="registry.osmocom.org"
This will make the Dockerfiles from docker-playground.git
use registry.osmocom.org rather than the public docker.io for base
distribution images like debian:stretch or the like.
This will avoid any strange timeout/EOF problems while doing
docker build --pull in our test jobs.
Change-Id: If4275cf3c8a5b70a67d742950a35ae8ead59a52e
Closes: OS#4839
---
M jobs/ttcn3-testsuites.yml
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index 2dd504f..8195770 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -196,6 +196,7 @@
builders:
- shell: |-
+ export REGISTRY_HOST="registry.osmocom.org"
case "{job-name}" in
TTCN3-centos-*-latest)
cd "$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/ |
sed s/\-latest$//)"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21021
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: If4275cf3c8a5b70a67d742950a35ae8ead59a52e
Gerrit-Change-Number: 21021
Gerrit-PatchSet: 4
Gerrit-Owner: laforge
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-ci[master]: ttcn3-testsuites: Set REGISTRY_HOST="registry.osmocom.org"
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/21021 ) Change subject: ttcn3-testsuites: Set REGISTRY_HOST="registry.osmocom.org" .. Patch Set 3: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If4275cf3c8a5b70a67d742950a35ae8ead59a52e Gerrit-Change-Number: 21021 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 16:57:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: README.md: Fixup ansible command line for docker login
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/21022 ) Change subject: README.md: Fixup ansible command line for docker login .. README.md: Fixup ansible command line for docker login We need to do a docker log in as 'osmocom-build' user, not as 'root' Related: OS#4839 Change-Id: I8ea0338e49d332382c9d08b21ee247244f97d141 --- M ansible/README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/ansible/README.md b/ansible/README.md index be15454..e5d146c 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -33,4 +33,4 @@ # how to make slaves log-in to registry.osmocom.org: -`ansible jenkins-slaves -u root -a "docker login -u jenkins-slave -p PASSWORD https://registry.osmocom.org/"` +`ansible jenkins-slaves -u root -a "su - osmocom-build -c 'docker login -u jenkins-slave -p PASSWD https://registry.osmocom.org/'"` -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8ea0338e49d332382c9d08b21ee247244f97d141 Gerrit-Change-Number: 21022 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-MessageType: merged
Change in osmo-ci[master]: Add jenkins job to update docker base images on registry.osmocom.org
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/21023 ) Change subject: Add jenkins job to update docker base images on registry.osmocom.org .. Patch Set 2: Verified+1 Code-Review+1 it's already deployed (but can of course be changed if somebody has strong review comments) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iec2d2e3a43b074cb60f75cbe852351ffa8e0009e Gerrit-Change-Number: 21023 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 16:56:42 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: README.md: Fixup ansible command line for docker login
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/21022 ) Change subject: README.md: Fixup ansible command line for docker login .. Patch Set 2: Verified+1 Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/21022/1/ansible/README.md File ansible/README.md: https://gerrit.osmocom.org/c/osmo-ci/+/21022/1/ansible/README.md@36 PS1, Line 36: `ansible jenkins-slaves -u root -a "su - osmocom-build -c 'docker login -u jenkins-slave -p gi7iShahng8gee https://registry.osmocom.org/'"` lol. That was my bad. I change the password to a new one, so don't bother trying that one... -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8ea0338e49d332382c9d08b21ee247244f97d141 Gerrit-Change-Number: 21022 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 16:56:06 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: README.md: Fixup ansible command line for docker login
laforge has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ci/+/21022 ) Change subject: README.md: Fixup ansible command line for docker login .. README.md: Fixup ansible command line for docker login We need to do a docker log in as 'osmocom-build' user, not as 'root' Related: OS#4839 Change-Id: I8ea0338e49d332382c9d08b21ee247244f97d141 --- M ansible/README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/21022/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8ea0338e49d332382c9d08b21ee247244f97d141 Gerrit-Change-Number: 21022 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-MessageType: newpatchset
Change in osmo-ci[master]: README.md: Fixup ansible command line for docker login
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/21022 ) Change subject: README.md: Fixup ansible command line for docker login .. README.md: Fixup ansible command line for docker login We need to do a docker log in as 'osmocom-build' user, not as 'root' Related: OS#4839 Change-Id: I8ea0338e49d332382c9d08b21ee247244f97d141 --- M ansible/README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/21022/1 diff --git a/ansible/README.md b/ansible/README.md index be15454..92b172a 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -33,4 +33,4 @@ # how to make slaves log-in to registry.osmocom.org: -`ansible jenkins-slaves -u root -a "docker login -u jenkins-slave -p PASSWORD https://registry.osmocom.org/"` +`ansible jenkins-slaves -u root -a "su - osmocom-build -c 'docker login -u jenkins-slave -p gi7iShahng8gee https://registry.osmocom.org/'"` -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8ea0338e49d332382c9d08b21ee247244f97d141 Gerrit-Change-Number: 21022 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange
Change in osmo-ci[master]: Add jenkins job to update docker base images on registry.osmocom.org
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/21023 )
Change subject: Add jenkins job to update docker base images on
registry.osmocom.org
..
Add jenkins job to update docker base images on registry.osmocom.org
Change-Id: Iec2d2e3a43b074cb60f75cbe852351ffa8e0009e
Related: OS#4839
---
A jobs/registry-update-base-images.yml
1 file changed, 37 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/23/21023/1
diff --git a/jobs/registry-update-base-images.yml
b/jobs/registry-update-base-images.yml
new file mode 100644
index 000..e036799
--- /dev/null
+++ b/jobs/registry-update-base-images.yml
@@ -0,0 +1,37 @@
+---
+- project:
+name: registry-update-base-images
+jobs:
+ - registry-update-base-images
+
+- job:
+name: registry-update-base-images
+description: |
+Update base docker images in our private reigstry.osmocom.org with
those from docker.io
+Related:
+
+ https://osmocom.org/issues/3839";>OS#4839
+
+node: osmocom-master-debian9
+builders:
+ - shell: |
+ REGISTRY="registry.osmocom.org"
+ IMAGES="debian:stretch debian:buster debian:jessie debian:sid
ubuntu:zesty centos:centos8"
+ for i in $IMAGES; do
+src=$i
+dst=${REGISTRY}/$i
+echo
+echo === $src
+docker pull $src
+docker tag $src $dst
+docker push $dst
+ done
+triggers:
+ - timed: "@daily"
+
+publishers:
+ - email:
+ notify-every-unstable-build: true
+ recipients: 'jenkins-notificati...@lists.osmocom.org'
+
+# vim: expandtab tabstop=2 shiftwidth=2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21023
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Iec2d2e3a43b074cb60f75cbe852351ffa8e0009e
Gerrit-Change-Number: 21023
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-ci[master]: ttcn3-testsuites: Set REGISTRY_HOST="registry.osmocom.org"
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/21021 )
Change subject: ttcn3-testsuites: Set REGISTRY_HOST="registry.osmocom.org"
..
ttcn3-testsuites: Set REGISTRY_HOST="registry.osmocom.org"
This will make the Dockerfiles from docker-playground.git
use registry.osmocom.org rather than the public docker.io for base
distribution images like debian:stretch or the like.
This will avoid any strange timeout/EOF problems while doing
docker build --pull in our test jobs.
Change-Id: If4275cf3c8a5b70a67d742950a35ae8ead59a52e
Closes: OS#4839
---
M jobs/ttcn3-testsuites.yml
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/21/21021/1
diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index 2dd504f..8195770 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -196,6 +196,7 @@
builders:
- shell: |-
+ export REGISTRY_HOST="registry.osmocom.org"
case "{job-name}" in
TTCN3-centos-*-latest)
cd "$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/ |
sed s/\-latest$//)"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/21021
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: If4275cf3c8a5b70a67d742950a35ae8ead59a52e
Gerrit-Change-Number: 21021
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in osmo-pcu[master]: tbf_ul: Allow non-egprs phones if EGPRS is enabled
Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20993 to look at the new patch set (#2). Change subject: tbf_ul: Allow non-egprs phones if EGPRS is enabled .. tbf_ul: Allow non-egprs phones if EGPRS is enabled We'll be able to still serve GPRS-only phones if EGPRS is enabled. Related: OS#4544 Change-Id: I2e01b9d0de7506e0c0960342d73dba29187fe61f --- M src/bts.h M src/tbf_ul.cpp 2 files changed, 0 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/93/20993/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2e01b9d0de7506e0c0960342d73dba29187fe61f Gerrit-Change-Number: 20993 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: pdch: Drop error log line about egprs not enabled
Hello Jenkins Builder, laforge, fixeria, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20929 to look at the new patch set (#5). Change subject: pdch: Drop error log line about egprs not enabled .. pdch: Drop error log line about egprs not enabled EGPRS "enabled" or "not enabled" is a bit of confusing idea, since there are different levels of EGPRS support. For instance we may have been instructed by config to not transmit using MCS5-9 (8PSK), or not use MCS1-9 at all (GMSK+8PSK). However, we cannot control what the MS sends to us, so if we arrived here, let's try to decode it anyway... Related: OS#4544 Change-Id: Ie70ec8e4a2d688762d7d320d6ad58d5a0cc52ea1 --- M src/pdch.cpp 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/29/20929/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie70ec8e4a2d688762d7d320d6ad58d5a0cc52ea1 Gerrit-Change-Number: 20929 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: tbf_dl: Don't fake EGPRS MS class when no related info is available
Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20936 to look at the new patch set (#4). Change subject: tbf_dl: Don't fake EGPRS MS class when no related info is available .. tbf_dl: Don't fake EGPRS MS class when no related info is available For instance if PCU received DL data to be sent to an MS from an SGSN, and the MS is not currently cached in the PCU (because there's no TBF active for it), it will page it and transmit the DL data to it. The SGSN is capable of sending (EGPRS) MS Class information in that same DL data message, so it's the one responsible for providing that information if not available at the PCU. In the PCU if we don't have information about that MS and SGSN didn't provide us information about it, we cannot assume the MS is going to be EGPRS capable and even less expecting a specific EGPRS MS class. So let's drop this code. Related: OS#4544 Change-Id: Icce66cadb51af25ae0c3b3719940eccb548fe33b --- M src/tbf_dl.cpp M tests/tbf/TbfTest.cpp M tests/tbf/TbfTest.err 3 files changed, 22 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/36/20936/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icce66cadb51af25ae0c3b3719940eccb548fe33b Gerrit-Change-Number: 20936 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: Get rid of bts->egprs_enabled
Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20994 to look at the new patch set (#2). Change subject: Get rid of bts->egprs_enabled .. Get rid of bts->egprs_enabled BTS simply notifies the PCU about the supported MCS, and PCU is responsible for providing correct data formatting supported for the BTS and the target MS. Related: OS#4544 Change-Id: Ifcf23771bd23afc64ca6fea38948f98f2d134ecb --- M src/bts.h M src/gprs_bssgp_pcu.cpp M src/pcu_l1_if.cpp M tests/edge/EdgeTest.cpp M tests/tbf/TbfTest.cpp M tests/types/TypesTest.cpp 6 files changed, 17 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/94/20994/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ifcf23771bd23afc64ca6fea38948f98f2d134ecb Gerrit-Change-Number: 20994 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: Move EGPRS MS mode set to gprs_ms.cpp
Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20991 to look at the new patch set (#2). Change subject: Move EGPRS MS mode set to gprs_ms.cpp .. Move EGPRS MS mode set to gprs_ms.cpp Some tests were wrong (TypesTest) and required modification, since they were setting a EGPRS MS but then expecting a GPRS assignment. Change-Id: I9d3ee21c765054a36bd22352e48bde5ffca9225a --- M src/gprs_ms.cpp M src/tbf.cpp M tests/alloc/AllocTest.err M tests/app_info/AppInfoTest.err M tests/tbf/TbfTest.err M tests/types/TypesTest.cpp M tests/types/TypesTest.err 7 files changed, 77 insertions(+), 78 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/91/20991/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9d3ee21c765054a36bd22352e48bde5ffca9225a Gerrit-Change-Number: 20991 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: pcuif: Improve BTS-supported CS/MCS handling
Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20990 to look at the new patch set (#2). Change subject: pcuif: Improve BTS-supported CS/MCS handling .. pcuif: Improve BTS-supported CS/MCS handling Take into account the MCS values supported by the BTS. In osmo-bts, in general all MCS are enabled if "mode egprs" is selected in BSC, and none otherwise. Change-Id: Ie8f0215ba17da1e545e98bec9325c02f1e8efaea --- M src/bts.cpp M src/bts.h M src/gprs_bssgp_pcu.cpp M src/pcu_l1_if.cpp M tests/emu/pcu_emu.cpp 5 files changed, 50 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/90/20990/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie8f0215ba17da1e545e98bec9325c02f1e8efaea Gerrit-Change-Number: 20990 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: Enable egprs support through PCUIF from BTS/BSC
Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 to look at the new patch set (#6). Change subject: Enable egprs support through PCUIF from BTS/BSC .. Enable egprs support through PCUIF from BTS/BSC This VTY command was added due to EGPRS being introduced later as an experimental feature. It's no longer needed and causes more problems than goodness (since people sometimes forgets to enable it). Let's rather simply enable EGPRS support based on what BTS/BSC requests over PCUIF. Related: OS#4544 Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 --- M src/pcu_l1_if.cpp M src/pcu_vty.c 2 files changed, 14 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/28/20928/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic80970a136361584da9c912252a07e7c3c9d85d0 Gerrit-Change-Number: 20928 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in osmo-pcu[master]: Take into account BTS supported (M)CS values when retrieving the maximum
Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/20992 to look at the new patch set (#2). Change subject: Take into account BTS supported (M)CS values when retrieving the maximum .. Take into account BTS supported (M)CS values when retrieving the maximum Change-Id: I2d3a8bbae2f9887400ce56d2f8303ea30abaecfa --- M src/bts.cpp M src/bts.h M src/gprs_bssgp_pcu.cpp M src/gprs_ms.cpp M src/pcu_l1_if.cpp M src/pcu_vty.c 6 files changed, 168 insertions(+), 55 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/92/20992/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2d3a8bbae2f9887400ce56d2f8303ea30abaecfa Gerrit-Change-Number: 20992 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in docker-playground[master]: introduce 'REGISTRY' argument to all Dockerfiles
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21019 ) Change subject: introduce 'REGISTRY' argument to all Dockerfiles .. Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I32d4ee6256033c809108c1b86cb6b6c58d880f49 Gerrit-Change-Number: 21019 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 16:23:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: introduce 'REGISTRY' argument to all Dockerfiles
laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/21019 )
Change subject: introduce 'REGISTRY' argument to all Dockerfiles
..
introduce 'REGISTRY' argument to all Dockerfiles
This is initialized to docker.io, keeping the default behaviour
if not specified. However, it allows us to specify a private
registry later on.
Related: OS#4839
Change-Id: I32d4ee6256033c809108c1b86cb6b6c58d880f49
---
M alpine-build/Dockerfile
M centos-repo-install-test/Dockerfile
M centos8-build/Dockerfile
M debian-buster-build/Dockerfile
M debian-buster-erlang/Dockerfile
M debian-jessie-build/Dockerfile
M debian-jessie-osmocom/Dockerfile
M debian-repo-install-test/Dockerfile
M debian-sid-build/Dockerfile
M debian-stretch-build/Dockerfile
M debian-stretch-jenkins/Dockerfile
M debian-stretch-titan/Dockerfile
M gr-gsm-master/Dockerfile
M make/Makefile
M open5gs-master/Dockerfile
M osmo-bsc-latest/Dockerfile
M osmo-bts-latest/Dockerfile
M osmo-cn-latest/Dockerfile
M osmo-ggsn-latest/Dockerfile
M osmo-hlr-latest/Dockerfile
M osmo-hnbgw-latest/Dockerfile
M osmo-mgw-latest/Dockerfile
M osmo-msc-latest/Dockerfile
M osmo-nitb-latest/Dockerfile
M osmo-pcu-latest/Dockerfile
M osmo-remsim-latest/Dockerfile
M osmo-sgsn-latest/Dockerfile
M osmo-sip-latest/Dockerfile
M osmo-stp-latest/Dockerfile
M ubuntu-zesty-build/Dockerfile
30 files changed, 60 insertions(+), 30 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/alpine-build/Dockerfile b/alpine-build/Dockerfile
index 622b838..26b8d29 100644
--- a/alpine-build/Dockerfile
+++ b/alpine-build/Dockerfile
@@ -1,4 +1,5 @@
-FROM alpine:3.6
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/alpine:3.6
MAINTAINER Harald Welte
diff --git a/centos-repo-install-test/Dockerfile
b/centos-repo-install-test/Dockerfile
index 45f0ba4..3f53650 100644
--- a/centos-repo-install-test/Dockerfile
+++ b/centos-repo-install-test/Dockerfile
@@ -1,5 +1,6 @@
ARGUSER
-FROM centos:centos8
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/centos:centos8
# dnf-utils: for repoquery
RUNdnf install -y \
diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile
index 511f350..46ce23e 100644
--- a/centos8-build/Dockerfile
+++ b/centos8-build/Dockerfile
@@ -1,4 +1,5 @@
-FROM centos:centos8
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/centos:centos8
# Let package metadata expire after 60 seconds instead of 48 hours
RUNecho "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf
diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile
index 28116ab..119afea 100644
--- a/debian-buster-build/Dockerfile
+++ b/debian-buster-build/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:buster
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:buster
MAINTAINER Harald Welte
diff --git a/debian-buster-erlang/Dockerfile b/debian-buster-erlang/Dockerfile
index 23da345..8ac470f 100644
--- a/debian-buster-erlang/Dockerfile
+++ b/debian-buster-erlang/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:buster
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:buster
MAINTAINER Harald Welte
diff --git a/debian-jessie-build/Dockerfile b/debian-jessie-build/Dockerfile
index 9a2f9fc..60f6ca9 100644
--- a/debian-jessie-build/Dockerfile
+++ b/debian-jessie-build/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:jessie
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:jessie
MAINTAINER Harald Welte
diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile
index e3709b2..77c223f 100644
--- a/debian-jessie-osmocom/Dockerfile
+++ b/debian-jessie-osmocom/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:jessie
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:jessie
MAINTAINER Harald Welte
diff --git a/debian-repo-install-test/Dockerfile
b/debian-repo-install-test/Dockerfile
index 5448fd6..e718a23 100644
--- a/debian-repo-install-test/Dockerfile
+++ b/debian-repo-install-test/Dockerfile
@@ -1,5 +1,6 @@
ARGUSER
-FROM debian:stretch
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:stretch
COPY Release.key /tmp/Release.key
diff --git a/debian-sid-build/Dockerfile b/debian-sid-build/Dockerfile
index 6348fc7..ffa86e2 100644
--- a/debian-sid-build/Dockerfile
+++ b/debian-sid-build/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:sid
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:sid
MAINTAINER Harald Welte
diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile
index 35440a0..ac52708 100644
--- a/debian-stretch-build/Dockerfile
+++ b/debian-stretch-build/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:stretch
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte
diff --git a/debian-stretch-jenkins/Dockerfile
b/debian-stretch-jenkins/Dockerfile
index e73b7ae..c682d9c 100644
--- a/debian-stretch-jenkins/Dockerfile
+++ b/debian-stretch-jenkins/Dockerfile
@@ -1,8 +1,9 @@
# Image used to
Change in osmo-ci[master]: jenkins: Do i386 builds for libosmocore gerrit + master
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/20831 )
Change subject: jenkins: Do i386 builds for libosmocore gerrit + master
..
jenkins: Do i386 builds for libosmocore gerrit + master
Change-Id: I0968849118e7eb58dd3626abc85bdbab89e34914
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 486ecd3..909584f 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -59,7 +59,7 @@
- libosmocore:
a1_name: arch
- a1: !!python/tuple [arm-none-eabi, amd64]
+ a1: !!python/tuple [arm-none-eabi, amd64, i386]
combination_filter: '!(arch=="arm-none-eabi" &&
label=="FreeBSD_amd64")'
cmd: '{docker_run} {docker_img} /build/contrib/jenkins_arch.sh
"$arch"'
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 47a9eea..6615c8f 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -111,7 +111,7 @@
- libosmocore:
a1_name: arch
- a1: !!python/tuple [arm-none-eabi, amd64]
+ a1: !!python/tuple [arm-none-eabi, amd64, i386]
combination_filter: '!(arch=="arm-none-eabi" &&
label=="FreeBSD_amd64")'
cmd: '{docker_run} {docker_img} /build/contrib/jenkins_arch.sh
"$arch"'
# Full triggers would be:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/20831
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I0968849118e7eb58dd3626abc85bdbab89e34914
Gerrit-Change-Number: 20831
Gerrit-PatchSet: 2
Gerrit-Owner: laforge
Gerrit-CC: pespin
Gerrit-MessageType: merged
Change in osmo-ci[master]: ttcn3-slave.yml: don't hard-code amd64 as the dpkg architecture
laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/20830 )
Change subject: ttcn3-slave.yml: don't hard-code amd64 as the dpkg architecture
..
ttcn3-slave.yml: don't hard-code amd64 as the dpkg architecture
We have no clue what the host architecture will be...
Change-Id: I32c0905c8e077faa02984ea67c452fcdb81440da
---
M ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
lynxis lazus: Looks good to me, approved
diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml
b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml
index 8e30cbf..227aad9 100644
--- a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml
+++ b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml
@@ -30,10 +30,14 @@
update_cache: yes
cache_valid_time: 3600
+- name: Get DEB architecture
+ shell: dpkg --print-architecture
+ register: deb_architecture
+
- name: Install libfftranscode0
apt:
-deb:
https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.1_amd64.deb
+deb:
https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.1_{{deb_architecture.stdout}}.deb
- name: Install libfftranscode-dev
apt:
-deb:
https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.1_amd64.deb
+deb:
https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.1_{{deb_architecture.stdout}}.deb
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/20830
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I32c0905c8e077faa02984ea67c452fcdb81440da
Gerrit-Change-Number: 20830
Gerrit-PatchSet: 2
Gerrit-Owner: laforge
Gerrit-Reviewer: lynxis lazus
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: measurement.c: fix integer overflow problem
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/20979 )
Change subject: measurement.c: fix integer overflow problem
..
Patch Set 2: Code-Review+1
(1 comment)
https://gerrit.osmocom.org/c/osmo-bts/+/20979/2/src/common/measurement.c
File src/common/measurement.c:
https://gerrit.osmocom.org/c/osmo-bts/+/20979/2/src/common/measurement.c@645
PS2, Line 645: if (num_meas_sub <= i) {
> I have checked it this way: […]
Yes I did the same and got same result. Nevermind my last comment, I think I
got confused by looking at an intermediate path version diff.
SO it looks fine to me now.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20979
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I381cc637d1c125f279ccf88db114609946fe24fe
Gerrit-Change-Number: 20979
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Mon, 02 Nov 2020 16:11:50 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: pespin
Comment-In-Reply-To: dexter
Gerrit-MessageType: comment
Change in docker-playground[master]: introduce 'REGISTRY' argument to all Dockerfiles
Hello fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/21019 to look at the new patch set (#2). Change subject: introduce 'REGISTRY' argument to all Dockerfiles .. introduce 'REGISTRY' argument to all Dockerfiles This is initialized to docker.io, keeping the default behaviour if not specified. However, it allows us to specify a private registry later on. Related: OS#4839 Change-Id: I32d4ee6256033c809108c1b86cb6b6c58d880f49 --- M alpine-build/Dockerfile M centos-repo-install-test/Dockerfile M centos8-build/Dockerfile M debian-buster-build/Dockerfile M debian-buster-erlang/Dockerfile M debian-jessie-build/Dockerfile M debian-jessie-osmocom/Dockerfile M debian-repo-install-test/Dockerfile M debian-sid-build/Dockerfile M debian-stretch-build/Dockerfile M debian-stretch-jenkins/Dockerfile M debian-stretch-titan/Dockerfile M gr-gsm-master/Dockerfile M make/Makefile M open5gs-master/Dockerfile M osmo-bsc-latest/Dockerfile M osmo-bts-latest/Dockerfile M osmo-cn-latest/Dockerfile M osmo-ggsn-latest/Dockerfile M osmo-hlr-latest/Dockerfile M osmo-hnbgw-latest/Dockerfile M osmo-mgw-latest/Dockerfile M osmo-msc-latest/Dockerfile M osmo-nitb-latest/Dockerfile M osmo-pcu-latest/Dockerfile M osmo-remsim-latest/Dockerfile M osmo-sgsn-latest/Dockerfile M osmo-sip-latest/Dockerfile M osmo-stp-latest/Dockerfile M ubuntu-zesty-build/Dockerfile 30 files changed, 60 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/19/21019/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I32d4ee6256033c809108c1b86cb6b6c58d880f49 Gerrit-Change-Number: 21019 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: measurement.c: fix integer overflow problem
dexter has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/20979 )
Change subject: measurement.c: fix integer overflow problem
..
Patch Set 2:
(2 comments)
I checked your expression with a bit of math, don't know if it is correct, but
it should be. num_meas_sub_expect is on both sides of the equation, so it
should be possible to eliminate it.
https://gerrit.osmocom.org/c/osmo-bts/+/20979/1/src/common/measurement.c
File src/common/measurement.c:
https://gerrit.osmocom.org/c/osmo-bts/+/20979/1/src/common/measurement.c@645
PS1, Line 645: if (num_meas_sub < num_meas_sub_expect
> if (num_meas_sub <= i)
Done
https://gerrit.osmocom.org/c/osmo-bts/+/20979/2/src/common/measurement.c
File src/common/measurement.c:
https://gerrit.osmocom.org/c/osmo-bts/+/20979/2/src/common/measurement.c@645
PS2, Line 645: if (num_meas_sub <= i) {
> I actually meant to change the second condition of the if iirc, so it shoudl
> actually be: […]
I have checked it this way:
num_ul_meas_expect - i <= num_meas_sub_expect - num_meas_sub
num_ul_meas_expect - i <= num_meas_sub_expect - num_meas_sub | -
num_meas_sub_expect
- i <= - num_meas_sub | + i + num_meas_sub
num_meas_sub <= i
That isn't correct?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20979
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I381cc637d1c125f279ccf88db114609946fe24fe
Gerrit-Change-Number: 20979
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-CC: pespin
Gerrit-Comment-Date: Mon, 02 Nov 2020 16:03:10 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin
Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: PCU_Tests: add 'f_multi_ms_' API for multi-MS test cases
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21008 )
Change subject: PCU_Tests: add 'f_multi_ms_' API for multi-MS test cases
..
PCU_Tests: add 'f_multi_ms_' API for multi-MS test cases
Change-Id: Ie2cc717f9f50db16748fe4e4a0ad80d549981e61
Related: OS#4838
---
M pcu/PCU_Tests.ttcn
1 file changed, 34 insertions(+), 6 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn
index 5e61d85..44314f3 100644
--- a/pcu/PCU_Tests.ttcn
+++ b/pcu/PCU_Tests.ttcn
@@ -238,6 +238,35 @@
BTS.receive(tr_RAW_PCU_EV(BTS_EV_SI13_NEGO));
}
+/* Register TLLI of each allocated GprsMS instance */
+private function f_multi_ms_bssgp_register()
+runs on RAW_PCU_Test_CT {
+ for (var integer i := 0; i < lengthof(g_ms); i := i + 1) {
+ f_bssgp_client_llgmm_assign(TLLI_UNUSED, g_ms[i].tlli);
+ }
+}
+
+/* Allocate [and activate] an Uplink TBF for each allocated GprsMS instance */
+private function f_multi_ms_establish_tbf(boolean do_activate := false)
+runs on RAW_PCU_Test_CT {
+ for (var integer i := 0; i < lengthof(g_ms); i := i + 1) {
+ /* Establish an Uplink TBF */
+ f_ms_establish_ul_tbf(g_ms[i]);
+
+ /* Send a random block, so this TBF becomes "active" */
+ if (do_activate) {
+ /* FIXME: use the new APU by Pau to get correct TRX/TS
here */
+ var template TsTrxBtsNum nr := ts_TsTrxBtsNum(7, i mod
8);
+ var octetstring dummy := f_rnd_octstring(12);
+ var RlcmacDlBlock dl_block;
+ var uint32_t poll_fn;
+
+ f_ms_tx_ul_data_block(g_ms[i], dummy, with_tlli :=
true, nr := nr);
+ f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, poll_fn, nr
:= nr);
+ }
+ }
+}
+
testcase TC_pcuif_suspend() runs on RAW_PCU_Test_CT {
var octetstring ra_id :=
enc_RoutingAreaIdentification(mp_gb_cfg.bvc[0].cell_id.ra_id);
var GprsTlli tlli := ''O;
@@ -2489,14 +2518,13 @@
/* Establish BSSGP connection to the PCU */
f_bssgp_establish();
- for (i := 0; i < num_ms; i := i + 1) {
- f_bssgp_client_llgmm_assign(TLLI_UNUSED, g_ms[i].tlli);
- }
+ f_multi_ms_bssgp_register();
- /* Establish an Uplink TBF for each MS. They should be allocated on
- different TRX in an uniform way. */
+ /* Establish an Uplink TBF for each GprsMS instance */
+ f_multi_ms_establish_tbf(do_activate := false);
+
+ /* Check if all TBFs are allocated on different TRX in an uniform way */
for (i := 0; i < num_ms; i := i + 1) {
- f_ms_establish_ul_tbf(g_ms[i]);
if (g_ms[i].ul_tbf.arfcn != info_ind.trx.v10[i mod 3].arfcn) {
setverdict(fail, "Got assigned ARFCN ",
g_ms[i].ul_tbf.arfcn,
" vs exp ", info_ind.trx.v10[i mod 3].arfcn);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21008
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: Ie2cc717f9f50db16748fe4e4a0ad80d549981e61
Gerrit-Change-Number: 21008
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: GPRS_Components: remove even more unused module imports
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21018 )
Change subject: GPRS_Components: remove even more unused module imports
..
GPRS_Components: remove even more unused module imports
Change-Id: I25b1f1e02c95db0f0aed3867f814f9476d3c0d0d
---
M pcu/GPRS_Components.ttcn
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn
index 10618f4..9dd4650 100644
--- a/pcu/GPRS_Components.ttcn
+++ b/pcu/GPRS_Components.ttcn
@@ -25,13 +25,9 @@
import from MobileL3_CommonIE_Types all;
import from L3_Templates all;
-import from UD_Types all;
import from PCUIF_Types all;
-import from PCUIF_CodecPort all;
import from PCUIF_Components all;
-import from IPL4asp_Types all;
import from Native_Functions all;
-import from SGSN_Components all;
type record TsTrxBtsNum {
uint3_t ts_nr,
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21018
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: I25b1f1e02c95db0f0aed3867f814f9476d3c0d0d
Gerrit-Change-Number: 21018
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: GPRS_Components: remove unused NS / BSSGP module imports
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21016 ) Change subject: GPRS_Components: remove unused NS / BSSGP module imports .. GPRS_Components: remove unused NS / BSSGP module imports Change-Id: Idf8a92b03015e6a44512e820d8a8bdba7ce556e9 --- M pcu/GPRS_Components.ttcn 1 file changed, 0 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 71613fc..2b8797f 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -26,13 +26,6 @@ import from MobileL3_CommonIE_Types all; import from L3_Templates all; -import from NS_Types all; -import from BSSGP_Types all; -import from Osmocom_Gb_Types all; - -import from BSSGP_Emulation all; /* BssgpConfig */ -import from NS_Emulation all; /* NSConfiguration */ - import from UD_Types all; import from PCUIF_Types all; import from PCUIF_CodecPort all; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21016 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: Idf8a92b03015e6a44512e820d8a8bdba7ce556e9 Gerrit-Change-Number: 21016 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: GPRS_Components: neither TELNET nor VTY API is used in this module
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21015 ) Change subject: GPRS_Components: neither TELNET nor VTY API is used in this module .. GPRS_Components: neither TELNET nor VTY API is used in this module Change-Id: I41813e1e2a8d7c54dffbabee9de4e0706293743e --- M pcu/GPRS_Components.ttcn 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 7364476..71613fc 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -17,9 +17,6 @@ import from GSM_Types all; import from GSM_RR_Types all; -import from Osmocom_VTY_Functions all; -import from TELNETasp_PortType all; - import from MobileL3_GMM_SM_Types all; import from RLCMAC_CSN1_Types all; import from RLCMAC_CSN1_Templates all; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21015 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: I41813e1e2a8d7c54dffbabee9de4e0706293743e Gerrit-Change-Number: 21015 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: GPRS_Components: remove unused import of MobileL3_GMM_SM_Types
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21017 ) Change subject: GPRS_Components: remove unused import of MobileL3_GMM_SM_Types .. GPRS_Components: remove unused import of MobileL3_GMM_SM_Types Change-Id: I502c2b9905e18915da179c1bdf57402f56bdf7bf --- M pcu/GPRS_Components.ttcn 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 2b8797f..10618f4 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -17,7 +17,6 @@ import from GSM_Types all; import from GSM_RR_Types all; -import from MobileL3_GMM_SM_Types all; import from RLCMAC_CSN1_Types all; import from RLCMAC_CSN1_Templates all; import from RLCMAC_Types all; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21017 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: I502c2b9905e18915da179c1bdf57402f56bdf7bf Gerrit-Change-Number: 21017 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-pcu[master]: tbf_dl: Don't fake EGPRS MS class when no related info is available
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/20936 ) Change subject: tbf_dl: Don't fake EGPRS MS class when no related info is available .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/20936/3/src/tbf_dl.cpp File src/tbf_dl.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/20936/3/src/tbf_dl.cpp@a134 PS3, Line 134: LOGP(DTBF, LOGL_NOTICE, "Not accepting non-EGPRS phone in EGPRS-only mode\n"); : bts->bts->do_rate_ctr_inc(CTR_TBF_FAILED_EGPRS_ONLY); : return NULL; > i think this error message and the rate counter are still applicable. […] Because this constraint in this code path makes no sense at the moment we support both EGPRS and GPRS MS, we simply allocated GPRS/EGPRS TBF based on MS class support. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/20936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Icce66cadb51af25ae0c3b3719940eccb548fe33b Gerrit-Change-Number: 20936 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 02 Nov 2020 15:11:49 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-bts[master]: measurement: account FACCH/H uplink measurements correctly
Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/20980 to look at the new patch set (#2). Change subject: measurement: account FACCH/H uplink measurements correctly .. measurement: account FACCH/H uplink measurements correctly When a FACCH block ist transmitted on a TCH/H, it wil be spread over 6 blocks and takes out two TCH/H voice blocks. This means that we will end up with one uplink measurement sample less. When the measurement result is calculated missing uplink measurements will be replaced with dummy values. In the case of a FACCH transmission no uplink measurement is missing, so in this case the calculation needs to expect less uplink measurement values in total. Change-Id: Ibf693aede8fffa6432cdcdcf5d52910493a1104b Related: OS#4799 --- M include/osmo-bts/gsm_data.h M src/common/l1sap.c M src/common/measurement.c 3 files changed, 24 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/80/20980/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibf693aede8fffa6432cdcdcf5d52910493a1104b Gerrit-Change-Number: 20980 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: GPRS_Components: remove even more unused module imports
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21018 ) Change subject: GPRS_Components: remove even more unused module imports .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21018 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: I25b1f1e02c95db0f0aed3867f814f9476d3c0d0d Gerrit-Change-Number: 21018 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 15:05:56 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: measurement: ignore lost FACCH/H uplink measurements
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/20980 ) Change subject: measurement: ignore lost FACCH/H uplink measurements .. Patch Set 1: (3 comments) > Patch Set 1: > > My assumption was wrong, we already do send to BFIs in the current > implementation: > > https://gerrit.osmocom.org/c/osmo-bts/+/20981 osmo-bts-trx/scheduler: fix > comments related to FACCH/H and BFI > > so why would we end up with one measurement sample less then? I guess the > problem is that one such BFI is ignored by the measurement logic as expected, > while another one is not, because it holds a valid RSSI value? During the > last call, I proposed to ignore the measurement samples carried by BFIs > triggered by FACCH, but what if we take the opposite approach and ignore > FACCH samples instead? In other words, you count speech frames as usual, > including all BFIs, but do not take FACCH samples into account. This way > there would be need to mess up with expected number of measurements, it would > always be constant. And of course, this is only in speech mode. In > signalling, we count FACCH frames as usual. What do you think? This might be the solution to the problem. I will give it a try. https://gerrit.osmocom.org/c/osmo-bts/+/20980/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/20980/1//COMMIT_MSG@9 PS1, Line 9: FACCH channel ist > It's not the 'channel' that is spread over 6 bursts, but a frame, right? […] I think "Block" is more right here. To my knowledge a frame is the 8 timeslots... https://gerrit.osmocom.org/c/osmo-bts/+/20980/1//COMMIT_MSG@11 PS1, Line 11: up with one uplink measurement sample less > Yes, and this is not a valid behavior. […] I think you mean a different bug. The BFI frames (blocks) that are handed up are ignored by measurement.c anyway since they are sent with RSSI=0 anyway. If you do the channel mapping drawings, you will see that there is indeed exactly one measurement value less when a FACCH is transmitted. (However, I think there are still bugs, but those affect the timing only.) https://gerrit.osmocom.org/c/osmo-bts/+/20980/1/src/common/measurement.c File src/common/measurement.c: https://gerrit.osmocom.org/c/osmo-bts/+/20980/1/src/common/measurement.c@670 PS1, Line 670: Lost %u UL measurements > This looks and sounds confusing: we're not loosing anything... Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibf693aede8fffa6432cdcdcf5d52910493a1104b Gerrit-Change-Number: 20980 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 02 Nov 2020 15:06:23 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: GPRS_Components: remove unused NS / BSSGP module imports
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21016 ) Change subject: GPRS_Components: remove unused NS / BSSGP module imports .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21016 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: Idf8a92b03015e6a44512e820d8a8bdba7ce556e9 Gerrit-Change-Number: 21016 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 15:05:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: GPRS_Components: neither TELNET nor VTY API is used in this module
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21015 ) Change subject: GPRS_Components: neither TELNET nor VTY API is used in this module .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21015 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: I41813e1e2a8d7c54dffbabee9de4e0706293743e Gerrit-Change-Number: 21015 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 15:05:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: GPRS_Components: remove unused import of MobileL3_GMM_SM_Types
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21017 ) Change subject: GPRS_Components: remove unused import of MobileL3_GMM_SM_Types .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21017 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: I502c2b9905e18915da179c1bdf57402f56bdf7bf Gerrit-Change-Number: 21017 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 15:05:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: measurement.c: fix integer overflow problem
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/20979 )
Change subject: measurement.c: fix integer overflow problem
..
Patch Set 2:
(1 comment)
https://gerrit.osmocom.org/c/osmo-bts/+/20979/2/src/common/measurement.c
File src/common/measurement.c:
https://gerrit.osmocom.org/c/osmo-bts/+/20979/2/src/common/measurement.c@645
PS2, Line 645: if (num_meas_sub <= i) {
I actually meant to change the second condition of the if iirc, so it shoudl
actually be:
if (num_meas_sub < num_meas_sub_expect && num_meas_sub <= i)
Check if it makes sense.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20979
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I381cc637d1c125f279ccf88db114609946fe24fe
Gerrit-Change-Number: 20979
Gerrit-PatchSet: 2
Gerrit-Owner: dexter
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-CC: pespin
Gerrit-Comment-Date: Mon, 02 Nov 2020 15:04:24 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: PCU_Tests: verify CS paging of multiple subscribers
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20998 ) Change subject: PCU_Tests: verify CS paging of multiple subscribers .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20998 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: Ie8b4006f969598c9b0c452002d559f985d108a66 Gerrit-Change-Number: 20998 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 14:49:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: PCU_Tests: add 'f_multi_ms_' API for multi-MS test cases
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21008 ) Change subject: PCU_Tests: add 'f_multi_ms_' API for multi-MS test cases .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21008 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: Ie2cc717f9f50db16748fe4e4a0ad80d549981e61 Gerrit-Change-Number: 21008 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 02 Nov 2020 14:48:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: measurement.c: fix integer overflow problem
Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/20979 to look at the new patch set (#2). Change subject: measurement.c: fix integer overflow problem .. measurement.c: fix integer overflow problem The variables num_meas_sub_expect - num_meas_sub must not be subtracted without prior checking. Depending on the input (which might be errornous), num_meas_sub might be greater then num_meas_sub_expect. This eventually leads into odd behavior, which can be difficult to debug. Change-Id: I381cc637d1c125f279ccf88db114609946fe24fe Related: OS#4799 --- M src/common/measurement.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/79/20979/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I381cc637d1c125f279ccf88db114609946fe24fe Gerrit-Change-Number: 20979 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-msc[master]: emergency: set route-to-msisdn MSISDN to "emergency" by default.
dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/20672 ) Change subject: emergency: set route-to-msisdn MSISDN to "emergency" by default. .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/20672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8a600cef105c0d67a9991e14b2187e26eacb01ec Gerrit-Change-Number: 20672 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon
Change in docker-playground[master]: introduce 'REGISTRY' argument to all Dockerfiles
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/21019 ) Change subject: introduce 'REGISTRY' argument to all Dockerfiles .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/21019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I32d4ee6256033c809108c1b86cb6b6c58d880f49 Gerrit-Change-Number: 21019 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 02 Nov 2020 13:52:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: introduce 'REGISTRY' argument to all Dockerfiles
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/21019 )
Change subject: introduce 'REGISTRY' argument to all Dockerfiles
..
introduce 'REGISTRY' argument to all Dockerfiles
This is initialized to docker.io, keeping the default behaviour
if not specified. However, it allows us to specify a private
registry later on.
Related: OS#4839
Change-Id: I32d4ee6256033c809108c1b86cb6b6c58d880f49
---
M alpine-build/Dockerfile
M centos-repo-install-test/Dockerfile
M centos8-build/Dockerfile
M debian-buster-build/Dockerfile
M debian-buster-erlang/Dockerfile
M debian-jessie-build/Dockerfile
M debian-jessie-osmocom/Dockerfile
M debian-repo-install-test/Dockerfile
M debian-sid-build/Dockerfile
M debian-stretch-build/Dockerfile
M debian-stretch-jenkins/Dockerfile
M debian-stretch-titan/Dockerfile
M gr-gsm-master/Dockerfile
M open5gs-master/Dockerfile
M osmo-bsc-latest/Dockerfile
M osmo-bts-latest/Dockerfile
M osmo-cn-latest/Dockerfile
M osmo-ggsn-latest/Dockerfile
M osmo-hlr-latest/Dockerfile
M osmo-hnbgw-latest/Dockerfile
M osmo-mgw-latest/Dockerfile
M osmo-msc-latest/Dockerfile
M osmo-nitb-latest/Dockerfile
M osmo-pcu-latest/Dockerfile
M osmo-remsim-latest/Dockerfile
M osmo-sgsn-latest/Dockerfile
M osmo-sip-latest/Dockerfile
M osmo-stp-latest/Dockerfile
M ubuntu-zesty-build/Dockerfile
29 files changed, 59 insertions(+), 30 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/19/21019/1
diff --git a/alpine-build/Dockerfile b/alpine-build/Dockerfile
index 622b838..26b8d29 100644
--- a/alpine-build/Dockerfile
+++ b/alpine-build/Dockerfile
@@ -1,4 +1,5 @@
-FROM alpine:3.6
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/alpine:3.6
MAINTAINER Harald Welte
diff --git a/centos-repo-install-test/Dockerfile
b/centos-repo-install-test/Dockerfile
index 45f0ba4..3f53650 100644
--- a/centos-repo-install-test/Dockerfile
+++ b/centos-repo-install-test/Dockerfile
@@ -1,5 +1,6 @@
ARGUSER
-FROM centos:centos8
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/centos:centos8
# dnf-utils: for repoquery
RUNdnf install -y \
diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile
index 511f350..46ce23e 100644
--- a/centos8-build/Dockerfile
+++ b/centos8-build/Dockerfile
@@ -1,4 +1,5 @@
-FROM centos:centos8
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/centos:centos8
# Let package metadata expire after 60 seconds instead of 48 hours
RUNecho "metadata_expire=60" >> /etc/dnf/dnf.conf && cat /etc/dnf/dnf.conf
diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile
index 28116ab..119afea 100644
--- a/debian-buster-build/Dockerfile
+++ b/debian-buster-build/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:buster
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:buster
MAINTAINER Harald Welte
diff --git a/debian-buster-erlang/Dockerfile b/debian-buster-erlang/Dockerfile
index 23da345..8ac470f 100644
--- a/debian-buster-erlang/Dockerfile
+++ b/debian-buster-erlang/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:buster
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:buster
MAINTAINER Harald Welte
diff --git a/debian-jessie-build/Dockerfile b/debian-jessie-build/Dockerfile
index 9a2f9fc..60f6ca9 100644
--- a/debian-jessie-build/Dockerfile
+++ b/debian-jessie-build/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:jessie
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:jessie
MAINTAINER Harald Welte
diff --git a/debian-jessie-osmocom/Dockerfile b/debian-jessie-osmocom/Dockerfile
index e3709b2..77c223f 100644
--- a/debian-jessie-osmocom/Dockerfile
+++ b/debian-jessie-osmocom/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:jessie
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:jessie
MAINTAINER Harald Welte
diff --git a/debian-repo-install-test/Dockerfile
b/debian-repo-install-test/Dockerfile
index 5448fd6..e718a23 100644
--- a/debian-repo-install-test/Dockerfile
+++ b/debian-repo-install-test/Dockerfile
@@ -1,5 +1,6 @@
ARGUSER
-FROM debian:stretch
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:stretch
COPY Release.key /tmp/Release.key
diff --git a/debian-sid-build/Dockerfile b/debian-sid-build/Dockerfile
index 6348fc7..ffa86e2 100644
--- a/debian-sid-build/Dockerfile
+++ b/debian-sid-build/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:sid
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:sid
MAINTAINER Harald Welte
diff --git a/debian-stretch-build/Dockerfile b/debian-stretch-build/Dockerfile
index 35440a0..ac52708 100644
--- a/debian-stretch-build/Dockerfile
+++ b/debian-stretch-build/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:stretch
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:stretch
MAINTAINER Harald Welte
diff --git a/debian-stretch-jenkins/Dockerfile
b/debian-stretch-jenkins/Dockerfile
index e73b7ae..c682d9c 100644
--- a/debian-stretch-jenkins/Dockerfile
+++ b/debian-stretch-jenkins/Dockerfile
@@ -1,8 +1,
Change in osmo-bts[master]: vty: fix missing / wrong documentation for some commands
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/21012 )
Change subject: vty: fix missing / wrong documentation for some commands
..
vty: fix missing / wrong documentation for some commands
Change-Id: Ie2f9e401c0f8f55307d98fa5afe5eb4182add43a
Related: SYS#4937, OS#3036
---
M src/common/vty.c
1 file changed, 18 insertions(+), 8 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/common/vty.c b/src/common/vty.c
index 6fe1ca7..7126458 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -490,7 +490,9 @@
cfg_bts_rtp_jitbuf_cmd,
X(BTS_VTY_ATTR_NEW_LCHAN),
"rtp jitter-buffer <0-1> [adaptive]",
- RTP_STR "RTP jitter buffer\n" "jitter buffer in ms\n")
+ RTP_STR "RTP jitter buffer\n"
+ "Jitter buffer in ms\n"
+ "Enable adaptive RTP jitter buffering\n")
{
struct gsm_bts *bts = vty->index;
@@ -502,9 +504,10 @@
}
DEFUN(cfg_bts_rtp_port_range,
- cfg_bts_rtp_port_range_cmd,
- "rtp port-range <1-65534> <1-65534>",
- RTP_STR "Range of local ports to use for RTP/RTCP traffic\n")
+ cfg_bts_rtp_port_range_cmd,
+ "rtp port-range <1-65534> <1-65534>",
+ RTP_STR "Range of local ports to use for RTP/RTCP traffic\n"
+ "Port range start (inclusive)\n" "Port range end (inclusive)\n")
{
struct gsm_bts *bts = vty->index;
unsigned int start;
@@ -725,7 +728,8 @@
DEFUN(cfg_bts_pcu_sock, cfg_bts_pcu_sock_cmd,
"pcu-socket PATH",
- "Configure the PCU socket file/path name\n")
+ "Configure the PCU socket file/path name\n"
+ "UNIX socket path\n")
{
struct gsm_bts *bts = vty->index;
@@ -759,9 +763,13 @@
return CMD_SUCCESS;
}
+#define SMSCB_STR \
+ "SMSCB (SMS Cell Broadcast) / CBCH configuration\n"
+
DEFUN_ATTR(cfg_bts_smscb_max_qlen, cfg_bts_smscb_max_qlen_cmd,
"smscb queue-max-length <1-60>",
- "Maximum queue length for SMSCB (CBCH) queue. In count of
messages/pages (Default: 15)",
+ SMSCB_STR "Maximum length of the SMSCB (CBCH) queue\n"
+ "Length in count of messages/pages (default: 15)\n",
CMD_ATTR_IMMEDIATE)
{
struct gsm_bts *bts = vty->index;
@@ -771,7 +779,8 @@
DEFUN_ATTR(cfg_bts_smscb_tgt_qlen, cfg_bts_smscb_tgt_qlen_cmd,
"smscb queue-target-length <1-30>",
- "Target queue length for SMSCB (CBCH) queue. In count of
messages/pages (Default: 2)",
+ SMSCB_STR "Target length of the SMSCB (CBCH) queue\n"
+ "Length in count of messages/pages (default: 2)\n",
CMD_ATTR_IMMEDIATE)
{
struct gsm_bts *bts = vty->index;
@@ -781,7 +790,8 @@
DEFUN_ATTR(cfg_bts_smscb_qhyst, cfg_bts_smscb_qhyst_cmd,
"smscb queue-hysteresis <0-30>",
- "Hysteresis for SMSCB (CBCH) queue. In count of messages/pages
(Default: 2)",
+ SMSCB_STR "Hysteresis of the SMSCB (CBCH) queue\n"
+ "In count of messages/pages (default: 2)\n",
CMD_ATTR_IMMEDIATE)
{
struct gsm_bts *bts = vty->index;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21012
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ie2f9e401c0f8f55307d98fa5afe5eb4182add43a
Gerrit-Change-Number: 21012
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: vty: fix double '%' in description of some commands
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/21013 )
Change subject: vty: fix double '%' in description of some commands
..
vty: fix double '%' in description of some commands
Command description is not a format string => no need to escape.
Change-Id: Ib2e339efccec1fc5416ab4b9460a27fa1f8e8044
---
M src/common/vty.c
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/common/vty.c b/src/common/vty.c
index 82fcba2..6fe1ca7 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -588,9 +588,9 @@
cfg_bts_agch_queue_mgmt_params_cmd,
"agch-queue-mgmt threshold <0-100> low <0-100> high <0-10>",
AGCH_QUEUE_STR
- "Threshold to start cleanup\nin %% of the maximum queue length\n"
- "Low water mark for cleanup\nin %% of the maximum queue length\n"
- "High water mark for cleanup\nin %% of the maximum queue length\n",
+ "Threshold to start cleanup\nin % of the maximum queue length\n"
+ "Low water mark for cleanup\nin % of the maximum queue length\n"
+ "High water mark for cleanup\nin % of the maximum queue length\n",
CMD_ATTR_IMMEDIATE)
{
struct gsm_bts *bts = vty->index;
@@ -672,8 +672,8 @@
"Configure filtering for uplink power control loop\n"
"Select the filtering algorithm\n"
"Exponentially Weighted Moving Average (EWMA)\n"
- "Smoothing factor (in %%): beta = (100 - alpha)\n"
- "1%% - lowest smoothing, 99%% - highest smoothing\n",
+ "Smoothing factor (in %): beta = (100 - alpha)\n"
+ "1% - lowest smoothing, 99% - highest smoothing\n",
CMD_ATTR_IMMEDIATE)
{
struct gsm_bts *bts = vty->index;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21013
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ib2e339efccec1fc5416ab4b9460a27fa1f8e8044
Gerrit-Change-Number: 21013
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: main: register VTY commands before handle_options()
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/20954 )
Change subject: main: register VTY commands before handle_options()
..
main: register VTY commands before handle_options()
Otherwise only those commands that are registered by libosmocore
appear in the generated XML VTY reference - change the order.
Instead of a pointer to 'struct gsm_bts', pass the application's
talloc context, as it's only used for dynamic command allocation.
Change-Id: Ic356a950da85de02c82e9882a5fbadaaa6929680
Related: SYS#4937, OS#3036
---
M include/osmo-bts/vty.h
M src/common/main.c
M src/common/vty.c
3 files changed, 13 insertions(+), 13 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/include/osmo-bts/vty.h b/include/osmo-bts/vty.h
index b6e3f0d..c9840d1 100644
--- a/include/osmo-bts/vty.h
+++ b/include/osmo-bts/vty.h
@@ -22,7 +22,7 @@
int bts_vty_go_parent(struct vty *vty);
int bts_vty_is_config_node(struct vty *vty, int node);
-int bts_vty_init(struct gsm_bts *bts);
+int bts_vty_init(void *ctx);
struct gsm_network *gsmnet_from_vty(struct vty *v);
diff --git a/src/common/main.c b/src/common/main.c
index 279e823..463b7a8 100644
--- a/src/common/main.c
+++ b/src/common/main.c
@@ -277,6 +277,9 @@
osmo_cpu_sched_vty_init(tall_bts_ctx);
rate_ctr_init(tall_bts_ctx);
+ bts_vty_init(tall_bts_ctx);
+ e1inp_vty_init();
+
handle_options(argc, argv);
bts = gsm_bts_alloc(tall_bts_ctx, 0);
@@ -285,9 +288,6 @@
exit(1);
}
- e1inp_vty_init();
- bts_vty_init(bts);
-
/* enable realtime priority for us */
if (rt_prio != -1) {
struct sched_param param;
diff --git a/src/common/vty.c b/src/common/vty.c
index d20b143..957678a 100644
--- a/src/common/vty.c
+++ b/src/common/vty.c
@@ -1815,33 +1815,33 @@
return CMD_SUCCESS;
}
-int bts_vty_init(struct gsm_bts *bts)
+int bts_vty_init(void *ctx)
{
- cfg_trx_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(bts,
gsmtap_sapi_names,
+ cfg_trx_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx,
gsmtap_sapi_names,
"gsmtap-sapi (",
"|",")", VTY_DO_LOWER);
- cfg_trx_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(bts,
gsmtap_sapi_names,
+ cfg_trx_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx,
gsmtap_sapi_names,
"Enable sending of UL/DL
messages over GSMTAP\n",
"\n", "", 0);
- cfg_trx_no_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(bts,
gsmtap_sapi_names,
+ cfg_trx_no_gsmtap_sapi_cmd.string = vty_cmd_string_from_valstr(ctx,
gsmtap_sapi_names,
"no gsmtap-sapi (",
"|",")", VTY_DO_LOWER);
- cfg_trx_no_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(bts,
gsmtap_sapi_names,
+ cfg_trx_no_gsmtap_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx,
gsmtap_sapi_names,
NO_STR "Disable sending of
UL/DL messages over GSMTAP\n",
"\n", "", 0);
- logging_fltr_l1_sapi_cmd.string = vty_cmd_string_from_valstr(bts,
l1sap_common_sapi_names,
+ logging_fltr_l1_sapi_cmd.string = vty_cmd_string_from_valstr(ctx,
l1sap_common_sapi_names,
"logging filter l1-sapi (",
"|", ")", VTY_DO_LOWER);
- logging_fltr_l1_sapi_cmd.doc = vty_cmd_string_from_valstr(bts,
l1sap_common_sapi_names,
+ logging_fltr_l1_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx,
l1sap_common_sapi_names,
LOGGING_STR FILTER_STR "L1
SAPI\n",
"\n", "", 0);
- no_logging_fltr_l1_sapi_cmd.string = vty_cmd_string_from_valstr(bts,
l1sap_common_sapi_names,
+ no_logging_fltr_l1_sapi_cmd.string = vty_cmd_string_from_valstr(ctx,
l1sap_common_sapi_names,
"no logging filter l1-sapi (",
"|", ")", VTY_DO_LOWER);
- no_logging_fltr_l1_sapi_cmd.doc = vty_cmd_string_from_valstr(bts,
l1sap_common_sapi_names,
+ no_logging_fltr_l1_sapi_cmd.doc = vty_cmd_string_from_valstr(ctx,
l1sap_common_sapi_names,
NO_STR LOGGING_STR FILTER_STR
"L1 SAPI\n",
"\n", "", 0);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/20954
To unsubscribe, or for help writing mail filters
Change in osmo-bts[master]: main: move general options from bts_vty_init()
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/21010 ) Change subject: main: move general options from bts_vty_init() .. main: move general options from bts_vty_init() These are not BTS specific options, so register them in main(). Change-Id: Ib6be66537791d489cb709d4d653c4cb434896f77 Related: SYS#4937, OS#3036 --- M src/common/main.c M src/common/vty.c 2 files changed, 6 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/common/main.c b/src/common/main.c index 463b7a8..67aeff3 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -38,6 +38,8 @@ #include #include #include +#include +#include #include #include #include @@ -277,6 +279,10 @@ osmo_cpu_sched_vty_init(tall_bts_ctx); rate_ctr_init(tall_bts_ctx); + logging_vty_add_cmds(); + osmo_talloc_vty_add_cmds(); + osmo_stats_vty_add_cmds(); + bts_vty_init(tall_bts_ctx); e1inp_vty_init(); diff --git a/src/common/vty.c b/src/common/vty.c index 957678a..82fcba2 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1853,10 +1853,6 @@ install_element_ve(&logging_fltr_l1_sapi_cmd); install_element_ve(&no_logging_fltr_l1_sapi_cmd); - logging_vty_add_cmds(); - osmo_talloc_vty_add_cmds(); - osmo_stats_vty_add_cmds(); - install_node(&bts_node, config_write_bts); install_element(CONFIG_NODE, &cfg_bts_cmd); install_element(CONFIG_NODE, &cfg_vty_telnet_port_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/21010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib6be66537791d489cb709d4d653c4cb434896f77 Gerrit-Change-Number: 21010 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: GPRS_Components: neither TELNET nor VTY API is used in this module
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21015 ) Change subject: GPRS_Components: neither TELNET nor VTY API is used in this module .. GPRS_Components: neither TELNET nor VTY API is used in this module Change-Id: I41813e1e2a8d7c54dffbabee9de4e0706293743e --- M pcu/GPRS_Components.ttcn 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/21015/1 diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 7364476..71613fc 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -17,9 +17,6 @@ import from GSM_Types all; import from GSM_RR_Types all; -import from Osmocom_VTY_Functions all; -import from TELNETasp_PortType all; - import from MobileL3_GMM_SM_Types all; import from RLCMAC_CSN1_Types all; import from RLCMAC_CSN1_Templates all; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21015 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: I41813e1e2a8d7c54dffbabee9de4e0706293743e Gerrit-Change-Number: 21015 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
