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: [ 173s] [COMPILING libboard/qmod/source/board_qmod.c] [ 173s] [COMPILING libboard/qmod/source/card_pres.c] [ 173s] [COMPILING libboard/qmod/source/i2c.c] [ 174s] [COMPILING libboard/qmod/source/wwan_led.c] [ 174s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 174s] [COMPILING apps/dfu/main.c] [ 174s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 174s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 174s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 175s] Memory region Used Size Region Size %age Used [ 175s] rom: 16592 B16 KB101.27% [ 175s] ram: 11680 B48 KB 23.76/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' [ 175s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 208 bytes [ 175s] collect2: error: ld returned 1 exit status [ 175s] % [ 175s] make[2]: *** [Makefile:230: flash] Error 1 [ 175s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 175s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 175s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 175s] dh_auto_build: error: make -j1 returned exit code 2 [ 175s] make: *** [debian/rules:16: build] Error 25 [ 175s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 175s] ### VM INTERACTION START ### [ 178s] [ 161.766117] sysrq: Power Off [ 178s] [ 161.771476] reboot: Power down [ 178s] ### VM INTERACTION END ### [ 178s] [ 178s] hci-cnode2-m1 failed "build simtrace2_0.7.0.76.62ad.dsc" at Wed Mar 17 01:44:19 UTC 2021. [ 178s] -- 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: [ 187s] [COMPILING apps/dfu/main.c] [ 187s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 187s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 187s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 187s] Memory region Used Size Region Size %age Used [ 187s] rom: 16600 B16 KB101.32% [ 187s] ram: 11688 B48 KB 23.78/usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 187s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 187s] /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' [ 187s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 187s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 187s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: warning: changing start of section .stack by 4 bytes [ 187s] /usr/lib/gcc/arm-none-eabi/9.2.1/../../../arm-none-eabi/bin/ld: region `rom' overflowed by 216 bytes [ 187s] collect2: error: ld returned 1 exit status [ 187s] % [ 187s] make[2]: *** [Makefile:230: flash] Error 1 [ 187s] make[2]: Leaving directory '/usr/src/packages/BUILD/firmware' [ 187s] make[1]: *** [Makefile:13: fw-qmod-dfu] Error 2 [ 187s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 187s] dh_auto_build: error: make -j1 returned exit code 2 [ 187s] make: *** [debian/rules:16: build] Error 25 [ 187s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 187s] ### VM INTERACTION START ### [ 191s] [ 177.539089] sysrq: Power Off [ 191s] [ 177.552182] reboot: Power down [ 191s] ### VM INTERACTION END ### [ 191s] [ 191s] sheep88 failed "build simtrace2_0.7.0.76.62ad.dsc" at Wed Mar 17 01:43:34 UTC 2021. [ 191s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)
Change in osmo-gsm-tester[master]: contrib: open5gs: Install more binaries to have an EPC
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23387 ) Change subject: contrib: open5gs: Install more binaries to have an EPC .. contrib: open5gs: Install more binaries to have an EPC Change-Id: I1ff143b4f876e28ad9a1bc6a4a4cad5dacef8e18 --- M contrib/jenkins-build-open5gs.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/jenkins-build-open5gs.sh b/contrib/jenkins-build-open5gs.sh index ecee8ca..7c743e6 100755 --- a/contrib/jenkins-build-open5gs.sh +++ b/contrib/jenkins-build-open5gs.sh @@ -9,4 +9,4 @@ build_repo $project_name "main" $configure_opts -create_bin_tgz "open5gs-mmed" +create_bin_tgz "open5gs-hssd open5gs-pcrfd open5gs-upfd open5gs-sgwud open5gs-smfd open5gs-sgwcd open5gs-mmed" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I1ff143b4f876e28ad9a1bc6a4a4cad5dacef8e18 Gerrit-Change-Number: 23387 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: contrib: open5gs: Install more binaries to have an EPC
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23387 ) Change subject: contrib: open5gs: Install more binaries to have an EPC .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I1ff143b4f876e28ad9a1bc6a4a4cad5dacef8e18 Gerrit-Change-Number: 23387 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 18:26:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: sysmocom/default.conf: Add missing default value for force_ul_amplitude
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23386 ) Change subject: sysmocom/default.conf: Add missing default value for force_ul_amplitude .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I04218dca21f27e32d7c85a74a3e9bbf63b499357 Gerrit-Change-Number: 23386 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 18:26:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: sysmocom/default.conf: Add missing default value for force_ul_amplitude
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23386 ) Change subject: sysmocom/default.conf: Add missing default value for force_ul_amplitude .. sysmocom/default.conf: Add missing default value for force_ul_amplitude Change-Id: I04218dca21f27e32d7c85a74a3e9bbf63b499357 --- M sysmocom/defaults.conf 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf index d491548..69d9ed9 100644 --- a/sysmocom/defaults.conf +++ b/sysmocom/defaults.conf @@ -182,6 +182,7 @@ freq_offset: 0 log_all_level: warning log_nas_level: warning + force_ul_amplitude: 0 amarisoftue: tx_gain: 89 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I04218dca21f27e32d7c85a74a3e9bbf63b499357 Gerrit-Change-Number: 23386 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in pysim[master]: filesystem: be more strict in method add_file()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23378 ) Change subject: filesystem: be more strict in method add_file() .. Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/pysim/+/23378/1/pySim/filesystem.py File pySim/filesystem.py: https://gerrit.osmocom.org/c/pysim/+/23378/1/pySim/filesystem.py@152 PS1, Line 152: if child.name[0:3] != "DF." and child.name[0:3] != "EF." and child.name[0:4] != "ADF.": I wouldn't enforce this name prefix. I think it's more a convention than "law". I also thin it is legitimate for files not to have a human-readable name. Let's say we encounter some card model with some proprietary files of which we don't know the name. The check for the FID looks reasonable to me. However, as the FID is 16bits, I'm not sure why we accept any length != 4 hex nibbles? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23378 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I096907285b742e611d221b03ba067ea2522e7e52 Gerrit-Change-Number: 23378 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Mar 2021 17:39:55 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: filesystem: add comment to inform about checks in add_file()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23377 ) Change subject: filesystem: add comment to inform about checks in add_file() .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iebae28909fe6aade3bd4024112a222819572d735 Gerrit-Change-Number: 23377 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Mar 2021 17:37:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: filesystem: fix exception string (fid != name)
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23376 ) Change subject: filesystem: fix exception string (fid != name) .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I054f3b3a156f0164c62610cfde1aec2145c20925 Gerrit-Change-Number: 23376 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Mar 2021 17:37:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: ts_102_221: fix fixup_fcp_proprietary_tlv_map()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23211 ) Change subject: ts_102_221: fix fixup_fcp_proprietary_tlv_map() .. Patch Set 4: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib06041361851f05dd990576fff47048dc1aa6290 Gerrit-Change-Number: 23211 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Mar 2021 17:37:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: contrib: open5gs: Install more binaries to have an EPC
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23387 ) Change subject: contrib: open5gs: Install more binaries to have an EPC .. contrib: open5gs: Install more binaries to have an EPC Change-Id: I1ff143b4f876e28ad9a1bc6a4a4cad5dacef8e18 --- M contrib/jenkins-build-open5gs.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/87/23387/1 diff --git a/contrib/jenkins-build-open5gs.sh b/contrib/jenkins-build-open5gs.sh index ecee8ca..7c743e6 100755 --- a/contrib/jenkins-build-open5gs.sh +++ b/contrib/jenkins-build-open5gs.sh @@ -9,4 +9,4 @@ build_repo $project_name "main" $configure_opts -create_bin_tgz "open5gs-mmed" +create_bin_tgz "open5gs-hssd open5gs-pcrfd open5gs-upfd open5gs-sgwud open5gs-smfd open5gs-sgwcd open5gs-mmed" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23387 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I1ff143b4f876e28ad9a1bc6a4a4cad5dacef8e18 Gerrit-Change-Number: 23387 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: sysmocom/default.conf: Add missing default value for force_ul_amplitude
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23386 ) Change subject: sysmocom/default.conf: Add missing default value for force_ul_amplitude .. sysmocom/default.conf: Add missing default value for force_ul_amplitude Change-Id: I04218dca21f27e32d7c85a74a3e9bbf63b499357 --- M sysmocom/defaults.conf 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/86/23386/1 diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf index d491548..69d9ed9 100644 --- a/sysmocom/defaults.conf +++ b/sysmocom/defaults.conf @@ -182,6 +182,7 @@ freq_offset: 0 log_all_level: warning log_nas_level: warning + force_ul_amplitude: 0 amarisoftue: tx_gain: 89 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23386 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I04218dca21f27e32d7c85a74a3e9bbf63b499357 Gerrit-Change-Number: 23386 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in pysim[master]: pySim-shell: add filesystem exporter
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23210 ) Change subject: pySim-shell: add filesystem exporter .. Patch Set 4: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/pysim/+/23210/4/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/23210/4/pySim-shell.py@178 PS4, Line 178: self._c should we really just ignore erros in reading files? I think we need to check _why_ reading/selecting fails. If the file doesn't exist, fine, let's ignore it and simply write "# file not found: %s". But what if selecting failed due to insufficient privileges? or the card actually reports an error while reading (for whatever reason)? I think in those situations we should actually throw the exception, or alteernativel first save all other files and then raise an exception at the end. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23210 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I82f3ce92cd91a5ed3c4884d62f6b22e9589c8a49 Gerrit-Change-Number: 23210 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-Comment-Date: Tue, 16 Mar 2021 17:36:47 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: pySim-shell: add functionality to walk through the fs recursively
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23208 ) Change subject: pySim-shell: add functionality to walk through the fs recursively .. Patch Set 4: Code-Review-1 prvious comment still not addressed -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23208 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If93d24dfb80c83eda39303c936910fa1fa7f48f8 Gerrit-Change-Number: 23208 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Mar 2021 17:33:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in pysim[master]: pySim-shell: add "dir" command.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23207 ) Change subject: pySim-shell: add "dir" command. .. Patch Set 5: no feedback to my comment? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23207 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic06a60e0a0ec54d9bb26e151453ceb49d69e3df7 Gerrit-Change-Number: 23207 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 16 Mar 2021 17:33:26 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in pysim[master]: filesystem: allow dumping multiple records of a file
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23206 ) Change subject: filesystem: allow dumping multiple records of a file .. Patch Set 5: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/pysim/+/23206/1/pySim/filesystem.py File pySim/filesystem.py: https://gerrit.osmocom.org/c/pysim/+/23206/1/pySim/filesystem.py@381 PS1, Line 381: records > I'd call this something like --count --record-count --record-quantity > --record-qty --num-of-records […] comment was not addressed -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id62db2cba4e3dfb6a7b3e6be8b892c16d11a8e3e Gerrit-Change-Number: 23206 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Mar 2021 17:33:01 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: sysmo/defaults.conf: Fix attribute name
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23380 ) Change subject: sysmo/defaults.conf: Fix attribute name .. sysmo/defaults.conf: Fix attribute name According to schema, the name is cipher_list. Same goes for "integrity". Fixes: a81801558e7bb6ef0f0a32ab078d302c91e940a8 Change-Id: Ib7b48ce207b96ea5f5b59db08320563be40edba1 --- M sysmocom/defaults.conf 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf index 7939d3e..d491548 100644 --- a/sysmocom/defaults.conf +++ b/sysmocom/defaults.conf @@ -144,11 +144,11 @@ root_seq_idx: 205 scell_list: [] ncell_list: [] - cipher_4g: + cipher_list: - eea0 - eea2 - eea1 - integrity_4g: + integrity_list: - eia2 - eia1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib7b48ce207b96ea5f5b59db08320563be40edba1 Gerrit-Change-Number: 23380 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: sysmo/defaults.conf: Fix attribute name
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23380 ) Change subject: sysmo/defaults.conf: Fix attribute name .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib7b48ce207b96ea5f5b59db08320563be40edba1 Gerrit-Change-Number: 23380 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:18:44 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srslte_common: fix condition to check if KPI have already extracted
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23385 ) Change subject: srslte_common: fix condition to check if KPI have already extracted .. srslte_common: fix condition to check if KPI have already extracted Change-Id: I6fdcbfadfdcfe131096d0345d2c21c87f8f7b1b6 --- M src/osmo_gsm_tester/obj/srslte_common.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/src/osmo_gsm_tester/obj/srslte_common.py b/src/osmo_gsm_tester/obj/srslte_common.py index cbc360f..aa41cd2 100644 --- a/src/osmo_gsm_tester/obj/srslte_common.py +++ b/src/osmo_gsm_tester/obj/srslte_common.py @@ -65,7 +65,7 @@ ''' Use the srsLTE KPI analyzer module (part of srsLTE.git) if available to collect KPIs ''' # Make sure this only runs once -if self.csv_kpi is not None or self.log_kpi is not None or self.stdout_kpi is not None: +if self.csv_kpi is not None and self.log_kpi is not None and self.stdout_kpi is not None: return # Start with empty KPIs -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I6fdcbfadfdcfe131096d0345d2c21c87f8f7b1b6 Gerrit-Change-Number: 23385 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: enb.py: increase ZMQ trx timeout to 8s
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23384 ) Change subject: enb.py: increase ZMQ trx timeout to 8s .. enb.py: increase ZMQ trx timeout to 8s increase value further to avoid failed tests due to load on system Change-Id: I77b7864e7ef60faf0262dc24325915d73dd2d5a3 --- M src/osmo_gsm_tester/obj/enb.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py index 99d43f8..80f7b6e 100644 --- a/src/osmo_gsm_tester/obj/enb.py +++ b/src/osmo_gsm_tester/obj/enb.py @@ -266,7 +266,7 @@ else: ul_rem_addr = self.ue.addr() -rf_dev_args = 'fail_on_disconnect=true,log_trx_timeout=true,trx_timeout_ms=4000' +rf_dev_args = 'fail_on_disconnect=true,log_trx_timeout=true,trx_timeout_ms=8000' idx = 0 cell_list = cfg_values['enb']['cell_list'] # Define all 8 possible RF ports (2x CA with 2x2 MIMO) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I77b7864e7ef60faf0262dc24325915d73dd2d5a3 Gerrit-Change-Number: 23384 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: ms_srs: add force_ul_amplitude config
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23383 )
Change subject: ms_srs: add force_ul_amplitude config
..
ms_srs: add force_ul_amplitude config
this allows to overwrite the PHY export option phy.force_ul_amplitude
Change-Id: I255f027433944c1739c89757609f0dcc3b8aa7cb
---
M src/osmo_gsm_tester/obj/ms_srs.py
M src/osmo_gsm_tester/templates/srsue.conf.tmpl
2 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/src/osmo_gsm_tester/obj/ms_srs.py
b/src/osmo_gsm_tester/obj/ms_srs.py
index f564519..767f887 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -42,6 +42,7 @@
'tx_gain': schema.INT,
'rx_gain': schema.INT,
'freq_offset': schema.INT,
+'force_ul_amplitude': schema.STR,
}
for key, val in RunNode.schema().items():
resource_schema['run_node.%s' % key] = val
diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
index 0250f2b..a953459 100644
--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
@@ -357,7 +357,9 @@
#pregenerate_signals = false
#pdsch_csi_enabled = true
#pdsch_8bit_decoder = false
-#force_ul_amplitude = 0
+% if float(ue.force_ul_amplitude) > 0:
+force_ul_amplitude = ${ue.force_ul_amplitude}
+% endif
#
# Simulation configuration options
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23383
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I255f027433944c1739c89757609f0dcc3b8aa7cb
Gerrit-Change-Number: 23383
Gerrit-PatchSet: 4
Gerrit-Owner: srs_andre
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: iperf3_bidir: add extra test for bi-directional iperf test
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23382 )
Change subject: iperf3_bidir: add extra test for bi-directional iperf test
..
iperf3_bidir: add extra test for bi-directional iperf test
Change-Id: Ibb62f53dbb15bc4788c92ebb2dee70e31dd851de
---
A sysmocom/suites/4g/iperf3_bidir.py
1 file changed, 45 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/sysmocom/suites/4g/iperf3_bidir.py
b/sysmocom/suites/4g/iperf3_bidir.py
new file mode 100755
index 000..bb1d73a
--- /dev/null
+++ b/sysmocom/suites/4g/iperf3_bidir.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+from osmo_gsm_tester.testenv import *
+
+epc = tenv.epc()
+enb = tenv.enb()
+ue = tenv.modem()
+iperf3srv = tenv.iperf3srv({'addr': epc.tun_addr()})
+iperf3srv.set_run_node(epc.run_node())
+iperf3cli = iperf3srv.create_client()
+iperf3cli.set_run_node(ue.run_node())
+
+epc.subscriber_add(ue)
+epc.start()
+enb.ue_add(ue)
+enb.start(epc)
+
+print('waiting for ENB to connect to EPC...')
+wait(epc.enb_is_connected, enb)
+print('ENB is connected to EPC')
+
+ue.connect(enb)
+
+max_rate_ratio = 0.8
+max_rate_dl = enb.ue_max_rate(downlink=True, num_carriers=ue.num_carriers)
+max_rate_ul = enb.ue_max_rate(downlink=False, num_carriers=ue.num_carriers)
+
+iperf3srv.start()
+proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_BI, ue.netns(),
bitrate=max_rate_dl)
+
+print('waiting for UE to attach...')
+wait(ue.is_registered)
+print('UE is attached')
+
+print("Running iperf3 client to %s through %s" % (str(iperf3cli), ue.netns()))
+proc.launch_sync()
+iperf3srv.stop()
+
+iperf3cli.print_results()
+iperf3srv.print_results(iperf3cli.proto() == iperf3cli.PROTO_UDP)
+
+# 80% of the maximum rate for half of the test duration
+half_duration = int(round(iperf3cli.time_sec() / 2))
+res_str = ue.verify_metric((max_rate_dl + max_rate_ul) * max_rate_ratio,
operation='max_rolling_avg', metric='dl_brate+ul_brate', criterion='gt',
window=half_duration)
+print(res_str)
+test.set_report_stdout(res_str)
\ No newline at end of file
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23382
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Ibb62f53dbb15bc4788c92ebb2dee70e31dd851de
Gerrit-Change-Number: 23382
Gerrit-PatchSet: 4
Gerrit-Owner: srs_andre
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: enb.py: increase ZMQ trx timeout to 8s
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23384 ) Change subject: enb.py: increase ZMQ trx timeout to 8s .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I77b7864e7ef60faf0262dc24325915d73dd2d5a3 Gerrit-Change-Number: 23384 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:12:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: ms_srs: add force_ul_amplitude config
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23383 ) Change subject: ms_srs: add force_ul_amplitude config .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I255f027433944c1739c89757609f0dcc3b8aa7cb Gerrit-Change-Number: 23383 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:12:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: iperf3_bidir: add extra test for bi-directional iperf test
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23382 ) Change subject: iperf3_bidir: add extra test for bi-directional iperf test .. Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ibb62f53dbb15bc4788c92ebb2dee70e31dd851de Gerrit-Change-Number: 23382 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:12:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srslte_common: fix condition to check if KPI have already extracted
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23385 ) Change subject: srslte_common: fix condition to check if KPI have already extracted .. Patch Set 4: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I6fdcbfadfdcfe131096d0345d2c21c87f8f7b1b6 Gerrit-Change-Number: 23385 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:12:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: enb.py: increase ZMQ trx timeout to 8s
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23384 ) Change subject: enb.py: increase ZMQ trx timeout to 8s .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I77b7864e7ef60faf0262dc24325915d73dd2d5a3 Gerrit-Change-Number: 23384 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:12:01 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: ms_srs: add force_ul_amplitude config
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23383 ) Change subject: ms_srs: add force_ul_amplitude config .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I255f027433944c1739c89757609f0dcc3b8aa7cb Gerrit-Change-Number: 23383 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:11:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: iperf3_bidir: add extra test for bi-directional iperf test
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23382 ) Change subject: iperf3_bidir: add extra test for bi-directional iperf test .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23382 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ibb62f53dbb15bc4788c92ebb2dee70e31dd851de Gerrit-Change-Number: 23382 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:11:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: AndroidUE: Fix connection timeout
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23350 )
Change subject: AndroidUE: Fix connection timeout
..
AndroidUE: Fix connection timeout
Change-Id: Iaacf348e2e018da5b67ada33079018c1859d3b63
---
M src/osmo_gsm_tester/obj/ms_android.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/src/osmo_gsm_tester/obj/ms_android.py
b/src/osmo_gsm_tester/obj/ms_android.py
index 0f4a05d..276938b 100644
--- a/src/osmo_gsm_tester/obj/ms_android.py
+++ b/src/osmo_gsm_tester/obj/ms_android.py
@@ -207,7 +207,7 @@
MainLoop.sleep(2)
timer -= 2
-if timer == 0:
+if timer <= 0:
raise log.Error('Connection timer of Android UE %s expired' %
self._run_node.adb_serial_id())
self.brate_mon = BitRateMonitor(self.testenv, self.run_dir,
self._run_node, self.rem_host, self.data_interface)
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23350
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Iaacf348e2e018da5b67ada33079018c1859d3b63
Gerrit-Change-Number: 23350
Gerrit-PatchSet: 6
Gerrit-Owner: ninjab3s
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Reviewer: srs_andre
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: mod-enb-ncells@.conf: add scenario file to select number of cells
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23348 )
Change subject: mod-enb-ncells@.conf: add scenario file to select number of
cells
..
mod-enb-ncells@.conf: add scenario file to select number of cells
Change-Id: Ib599de56b0b51a12895014d78d3d649c01a0
---
A sysmocom/scenarios/mod-enb-ncells@.conf
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/sysmocom/scenarios/mod-enb-ncells@.conf
b/sysmocom/scenarios/mod-enb-ncells@.conf
new file mode 100644
index 000..b57b94a
--- /dev/null
+++ b/sysmocom/scenarios/mod-enb-ncells@.conf
@@ -0,0 +1,3 @@
+modifiers:
+ enb:
+ - num_cells: ${param1}
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23348
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Ib599de56b0b51a12895014d78d3d649c01a0
Gerrit-Change-Number: 23348
Gerrit-PatchSet: 6
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: ms_srs: turn tx/rx_gain into INT and make them optional
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23349 )
Change subject: ms_srs: turn tx/rx_gain into INT and make them optional
..
ms_srs: turn tx/rx_gain into INT and make them optional
when they are greater than 0 they are written as config paramter.
if they are -1 they are disbaled and automatic gain calibration is
used.
Change-Id: I473ff3ae679784178574d2f76b612dbf77180490
---
M src/osmo_gsm_tester/obj/ms_srs.py
M src/osmo_gsm_tester/templates/srsue.conf.tmpl
2 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/src/osmo_gsm_tester/obj/ms_srs.py
b/src/osmo_gsm_tester/obj/ms_srs.py
index df83c2a..f564519 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -39,8 +39,8 @@
'additional_args[]': schema.STR,
'airplane_t_on_ms': schema.INT,
'airplane_t_off_ms': schema.INT,
-'tx_gain': schema.UINT,
-'rx_gain': schema.UINT,
+'tx_gain': schema.INT,
+'rx_gain': schema.INT,
'freq_offset': schema.INT,
}
for key, val in RunNode.schema().items():
diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
index a922dc8..0250f2b 100644
--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
@@ -39,8 +39,12 @@
dl_earfcn = 2850
% endif
freq_offset = ${ue.freq_offset}
+% if int(ue.tx_gain) > 0:
tx_gain = ${ue.tx_gain}
+% endif
+% if int(ue.rx_gain) > 0:
rx_gain = ${ue.rx_gain}
+% endif
#nof_radios = 1
nof_antennas = ${ue.num_antennas}
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23349
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I473ff3ae679784178574d2f76b612dbf77180490
Gerrit-Change-Number: 23349
Gerrit-PatchSet: 6
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: run_node: add label to RunNode class
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23347 )
Change subject: run_node: add label to RunNode class
..
run_node: add label to RunNode class
this allows specifying a label on each run node that can be used
to filter/select specific nodes.
Change-Id: Ib6a977007f56d6ff9ff029aaf049a75fb5d5e1dd
---
M src/osmo_gsm_tester/obj/run_node.py
1 file changed, 8 insertions(+), 3 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/src/osmo_gsm_tester/obj/run_node.py
b/src/osmo_gsm_tester/obj/run_node.py
index 72879a7..676c262 100644
--- a/src/osmo_gsm_tester/obj/run_node.py
+++ b/src/osmo_gsm_tester/obj/run_node.py
@@ -30,13 +30,14 @@
T_LOCAL = 'local'
T_REM_SSH = 'ssh'
-def __init__(self, type=None, run_addr=None, ssh_user=None, ssh_addr=None,
run_label=None, ssh_port=None, adb_serial_id=None):
+def __init__(self, type=None, run_addr=None, ssh_user=None, ssh_addr=None,
run_label=None, label=None, ssh_port=None, adb_serial_id=None):
super().__init__(log.C_RUN, 'runnode')
self._type = type
self._run_addr = run_addr
self._ssh_user = ssh_user
self._ssh_addr = ssh_addr
self._run_label = run_label
+self._label = label
self._ssh_port = ssh_port
self._adb_serial_id = adb_serial_id
if not self._type:
@@ -57,8 +58,8 @@
def from_conf(cls, conf):
return cls(conf.get('run_type', None), conf.get('run_addr', None),
conf.get('ssh_user', None), conf.get('ssh_addr', None),
- conf.get('run_label', None), conf.get('ssh_port', None),
- conf.get('adb_serial_id', None))
+ conf.get('run_label', None), conf.get('label', None),
+ conf.get('ssh_port', None), conf.get('adb_serial_id', None))
@classmethod
def schema(cls):
@@ -68,6 +69,7 @@
'ssh_user': schema.STR,
'ssh_addr': schema.IPV4,
'run_label': schema.STR,
+'label': schema.STR,
'ssh_port': schema.STR,
'adb_serial_id': schema.STR,
}
@@ -94,6 +96,9 @@
def run_label(self):
return self._run_label
+def label(self):
+return self._label
+
def ssh_port(self):
return self._ssh_port
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23347
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Ib6a977007f56d6ff9ff029aaf049a75fb5d5e1dd
Gerrit-Change-Number: 23347
Gerrit-PatchSet: 6
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: AndroidUE: Fix connection timeout
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23350 ) Change subject: AndroidUE: Fix connection timeout .. Patch Set 6: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23350 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Iaacf348e2e018da5b67ada33079018c1859d3b63 Gerrit-Change-Number: 23350 Gerrit-PatchSet: 6 Gerrit-Owner: ninjab3s Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Reviewer: srs_andre Gerrit-Comment-Date: Tue, 16 Mar 2021 17:10:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: ms_srs: turn tx/rx_gain into INT and make them optional
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23349 ) Change subject: ms_srs: turn tx/rx_gain into INT and make them optional .. Patch Set 6: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23349 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I473ff3ae679784178574d2f76b612dbf77180490 Gerrit-Change-Number: 23349 Gerrit-PatchSet: 6 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:10:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: run_node: add label to RunNode class
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23347 ) Change subject: run_node: add label to RunNode class .. Patch Set 6: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib6a977007f56d6ff9ff029aaf049a75fb5d5e1dd Gerrit-Change-Number: 23347 Gerrit-PatchSet: 6 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:10:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: mod-enb-ncells@.conf: add scenario file to select number of cells
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23348 ) Change subject: mod-enb-ncells@.conf: add scenario file to select number of cells .. Patch Set 6: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23348 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib599de56b0b51a12895014d78d3d649c01a0 Gerrit-Change-Number: 23348 Gerrit-PatchSet: 6 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:10:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: ms_srs: add force_ul_amplitude config
pespin has uploaded a new patch set (#4) to the change originally created by srs_andre. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23383 ) Change subject: ms_srs: add force_ul_amplitude config .. ms_srs: add force_ul_amplitude config this allows to overwrite the PHY export option phy.force_ul_amplitude Change-Id: I255f027433944c1739c89757609f0dcc3b8aa7cb --- M src/osmo_gsm_tester/obj/ms_srs.py M src/osmo_gsm_tester/templates/srsue.conf.tmpl 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/83/23383/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I255f027433944c1739c89757609f0dcc3b8aa7cb Gerrit-Change-Number: 23383 Gerrit-PatchSet: 4 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-gsm-tester[master]: epc-label@.conf: add scenario to select runnode based on label
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23345 )
Change subject: epc-label@.conf: add scenario to select runnode based on label
..
epc-label@.conf: add scenario to select runnode based on label
this allows to select the resource/machine the EPC runs on based on the label
Change-Id: I710c67ad5a11bd33071acd779e19835ae49ce4a3
---
A sysmocom/scenarios/epc-label@.conf
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/sysmocom/scenarios/epc-label@.conf
b/sysmocom/scenarios/epc-label@.conf
new file mode 100644
index 000..bf0d710
--- /dev/null
+++ b/sysmocom/scenarios/epc-label@.conf
@@ -0,0 +1,3 @@
+resources:
+ run_node:
+ - label: ${param1}
\ No newline at end of file
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23345
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I710c67ad5a11bd33071acd779e19835ae49ce4a3
Gerrit-Change-Number: 23345
Gerrit-PatchSet: 5
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: ms_android: set num_carriers to 1 by default
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23344 )
Change subject: ms_android: set num_carriers to 1 by default
..
ms_android: set num_carriers to 1 by default
throughput tests require the UE object to have the num_carriers
member. For Android UEs, set it to 1 by default.
Change-Id: I297d24bb578a7db0eb7629be4f2cc0d54624467d
---
M src/osmo_gsm_tester/obj/ms_android.py
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/src/osmo_gsm_tester/obj/ms_android.py
b/src/osmo_gsm_tester/obj/ms_android.py
index 9fddff3..0f4a05d 100644
--- a/src/osmo_gsm_tester/obj/ms_android.py
+++ b/src/osmo_gsm_tester/obj/ms_android.py
@@ -79,6 +79,7 @@
self.remote_metrics_file = None
self.metrics_file = None
self.brate_mon = None
+self.num_carriers = 1
def configure(self):
values = dict(ue=config.get_defaults('androidue'))
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23344
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I297d24bb578a7db0eb7629be4f2cc0d54624467d
Gerrit-Change-Number: 23344
Gerrit-PatchSet: 5
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: osmo-gsm-tester_androidue_conn_chk.sh: improve error handling
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23343 )
Change subject: osmo-gsm-tester_androidue_conn_chk.sh: improve error handling
..
osmo-gsm-tester_androidue_conn_chk.sh: improve error handling
fix check of $serial and check passed arguments.
exit when adb isn't installed on host
Change-Id: I6190a840dbc86838457da96d188afc17f83ab15f
---
M utils/bin/osmo-gsm-tester_androidue_conn_chk.sh
1 file changed, 26 insertions(+), 3 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/utils/bin/osmo-gsm-tester_androidue_conn_chk.sh
b/utils/bin/osmo-gsm-tester_androidue_conn_chk.sh
index d8ff049..2bdb9de 100644
--- a/utils/bin/osmo-gsm-tester_androidue_conn_chk.sh
+++ b/utils/bin/osmo-gsm-tester_androidue_conn_chk.sh
@@ -1,11 +1,34 @@
#!/bin/bash
-# This script reads the network type of an Android phone via ADB
+# This script reads the network type of an Android phone via ADB/SSH
+# If the first argument (serial) is 0, SSH is used to remotely connect to the
phone
# usage: osmo-gsm-tester_androidue_conn_chk.sh $serial $remote_ip $remote_port
+#set -x
+
+# check if all parameters have been passed
+if ([ ! $3 ])
+then
+ echo "Please call script with osmo-gsm-tester_androidue_conn_chk.sh $serial
$remote_ip $remote_port"
+ echo "E.g. ./osmo-gsm-tester_androidue_conn_chk.sh df2df 10.12.1.106 130 10"
+ exit
+fi
+
serial=$1
remote_ip=$2
remote_port=$3
+
+echo "Waiting for Android UE to become available .."
+
+# Check adb is available, if needed
+if [ "$serial" != "0" ]; then
+ if ! [ -x "$(command -v adb)" ]; then
+echo 'Error: adb is not installed.' >&2
+exit 1
+ fi
+ echo "Using SSH to access device"
+fi
+
while true; do
- if [ "${serial}" == "0" ]; then
+ if [ "$serial" == "0" ]; then
# run_type == ssh
ssh -p "${remote_port}" root@"${remote_ip}" getprop "gsm.network.type"
else
@@ -13,4 +36,4 @@
adb -s "${serial}" shell getprop "gsm.network.type"
fi
sleep 1
-done
+done
\ No newline at end of file
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23343
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I6190a840dbc86838457da96d188afc17f83ab15f
Gerrit-Change-Number: 23343
Gerrit-PatchSet: 5
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: epc-label@.conf: add scenario to select runnode based on label
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23345 ) Change subject: epc-label@.conf: add scenario to select runnode based on label .. Patch Set 5: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23345 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I710c67ad5a11bd33071acd779e19835ae49ce4a3 Gerrit-Change-Number: 23345 Gerrit-PatchSet: 5 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:09:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: ms_android: set num_carriers to 1 by default
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23344 ) Change subject: ms_android: set num_carriers to 1 by default .. Patch Set 5: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23344 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I297d24bb578a7db0eb7629be4f2cc0d54624467d Gerrit-Change-Number: 23344 Gerrit-PatchSet: 5 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:09:00 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: osmo-gsm-tester_androidue_conn_chk.sh: improve error handling
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23343 ) Change subject: osmo-gsm-tester_androidue_conn_chk.sh: improve error handling .. Patch Set 5: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23343 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I6190a840dbc86838457da96d188afc17f83ab15f Gerrit-Change-Number: 23343 Gerrit-PatchSet: 5 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:08:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: jenkins-build-amarisoft: copy ltesim_server binary into epc trial tgz
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23341 )
Change subject: jenkins-build-amarisoft: copy ltesim_server binary into epc
trial tgz
..
jenkins-build-amarisoft: copy ltesim_server binary into epc trial tgz
the ltesim_server is part of the UE package but needs to be executed
on the EPC run node. Therefore its handy to have the binary in the epc
trial tgz.
Change-Id: I21ac57d1c1547c1cf4d2394c8593f58ff2c78697
---
M contrib/jenkins-build-amarisoft.sh
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/contrib/jenkins-build-amarisoft.sh
b/contrib/jenkins-build-amarisoft.sh
index 43755ea..1ed7d7d 100755
--- a/contrib/jenkins-build-amarisoft.sh
+++ b/contrib/jenkins-build-amarisoft.sh
@@ -78,6 +78,10 @@
# Create amarisoftepc inst:
rm -rf inst-amarisoftepc && mkdir inst-amarisoftepc || exit 1
tar --strip-components=1 -zxf inst-tmp/*/ltemme-linux*.tar.gz -C
inst-amarisoftepc/
+# Copy ltesim_server from UE package if available
+if [ "x${HAVE_AMARISOFT_LTEUE}" = "x1" ]; then
+cp inst-amarisoftue/ltesim_server inst-amarisoftepc/
+fi
this="amarisoftepc.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}"
tar="${this}.tgz"
tar -czf "$tar" -C inst-amarisoftepc/ .
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23341
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I21ac57d1c1547c1cf4d2394c8593f58ff2c78697
Gerrit-Change-Number: 23341
Gerrit-PatchSet: 3
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: srsenb_sib.conf.tmpl: reduce the default size of the PUCCH
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23340 )
Change subject: srsenb_sib.conf.tmpl: reduce the default size of the PUCCH
..
srsenb_sib.conf.tmpl: reduce the default size of the PUCCH
optimized PUCCH config
Change-Id: I45ae7c33f9d1df20df37c0fe6c3d73aa85ae1b31
---
M src/osmo_gsm_tester/templates/srsenb_sib.conf.tmpl
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/src/osmo_gsm_tester/templates/srsenb_sib.conf.tmpl
b/src/osmo_gsm_tester/templates/srsenb_sib.conf.tmpl
index c738480..7451131 100644
--- a/src/osmo_gsm_tester/templates/srsenb_sib.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb_sib.conf.tmpl
@@ -77,8 +77,8 @@
};
pucch_cnfg =
{
-delta_pucch_shift = 2;
-n_rb_cqi = 2;
+delta_pucch_shift = 1;
+n_rb_cqi = 1;
n_cs_an = 0;
n1_pucch_an = 12;
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23340
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I45ae7c33f9d1df20df37c0fe6c3d73aa85ae1b31
Gerrit-Change-Number: 23340
Gerrit-PatchSet: 3
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: srsue.conf.tmpl: Adjust ue.config template for new pcap path
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23339 )
Change subject: srsue.conf.tmpl: Adjust ue.config template for new pcap path
..
srsue.conf.tmpl: Adjust ue.config template for new pcap path
Change-Id: I4af6abaa3973652a12f571d88bca59cd443704f3
---
M src/osmo_gsm_tester/templates/srsue.conf.tmpl
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
index 272ae48..a922dc8 100644
--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
@@ -78,10 +78,10 @@
# nas_filename: File path to use for NAS packet captures
#
[pcap]
-enable = ${'true' if ue.enable_pcap else 'false'}
-filename = ${ue.pcap_filename}
-nas_enable = false
-nas_filename = /tmp/nas.pcap
+enable = ${'mac' if ue.enable_pcap else 'none'}
+mac_filename = ${ue.pcap_filename}
+mac_nr_filename = /tmp/ue_mac_nr.pcap
+nas_filename = /tmp/ue_nas.pcap
#
# Log configuration
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23339
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I4af6abaa3973652a12f571d88bca59cd443704f3
Gerrit-Change-Number: 23339
Gerrit-PatchSet: 3
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: ms_srs: add config scheme to select NAS log level
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23338 )
Change subject: ms_srs: add config scheme to select NAS log level
..
ms_srs: add config scheme to select NAS log level
we've provided only all_log_level so far but sometimes it's needed
to select the level per layer. This patch adds the ability
to do so for the NAS layer in the UE.
Change-Id: Iab2bce65e8af81f6d344849c97952e6441cb2846
---
M src/osmo_gsm_tester/obj/ms_srs.py
M src/osmo_gsm_tester/templates/srsue.conf.tmpl
M sysmocom/defaults.conf
3 files changed, 3 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/src/osmo_gsm_tester/obj/ms_srs.py
b/src/osmo_gsm_tester/obj/ms_srs.py
index aaeeca5..df83c2a 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -50,6 +50,7 @@
config_schema = {
'enable_pcap': schema.BOOL_STR,
'log_all_level': schema.STR,
+'log_nas_level': schema.STR
}
schema.register_config_schema('modem', config_schema)
diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
index 0939823..272ae48 100644
--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
@@ -109,6 +109,7 @@
all_hex_limit = 32
filename = ${ue.log_filename}
file_max_size = -1
+nas_level = ${ue.log_nas_level}
#
# USIM configuration
diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf
index d66e030..7939d3e 100644
--- a/sysmocom/defaults.conf
+++ b/sysmocom/defaults.conf
@@ -181,6 +181,7 @@
rx_gain: 40
freq_offset: 0
log_all_level: warning
+ log_nas_level: warning
amarisoftue:
tx_gain: 89
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23338
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Iab2bce65e8af81f6d344849c97952e6441cb2846
Gerrit-Change-Number: 23338
Gerrit-PatchSet: 3
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: srsenb_drb.conf.tmpl: add QCI10 with infinit PDCP discard timer
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23337 )
Change subject: srsenb_drb.conf.tmpl: add QCI10 with infinit PDCP discard timer
..
srsenb_drb.conf.tmpl: add QCI10 with infinit PDCP discard timer
copy of QCI9 params but with infinit PDCP discard to avoid SDU drops
at PDCP
Change-Id: I64a74d09cc1a55ba21a7be7b5cc203e56bba3b10
---
M src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl
1 file changed, 26 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl
b/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl
index a171a5e..b1c69b7 100644
--- a/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl
@@ -93,6 +93,32 @@
bucket_size_duration = 100;
log_chan_group = 3;
};
+},
+// QCI 10 is a modified QCI 9 with PDCP discard timer set to infinity to avoid
SDU drops at PDCP
+{
+ qci=10;
+ pdcp_config = {
+discard_timer = -1;
+status_report_required = true;
+ }
+ rlc_config = {
+ul_am = {
+ t_poll_retx = 120;
+ poll_pdu = 64;
+ poll_byte = 750;
+ max_retx_thresh = 16;
+};
+dl_am = {
+ t_reordering = 50;
+ t_status_prohibit = 50;
+};
+ };
+ logical_channel_config = {
+priority = 11;
+prioritized_bit_rate = -1;
+bucket_size_duration = 100;
+log_chan_group = 3;
+ };
}
);
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23337
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I64a74d09cc1a55ba21a7be7b5cc203e56bba3b10
Gerrit-Change-Number: 23337
Gerrit-PatchSet: 3
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: amarisoft_drb.cfg.tmpl: add additional QCI10 with infinit PDCP discar...
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23336 )
Change subject: amarisoft_drb.cfg.tmpl: add additional QCI10 with infinit PDCP
discard timer
..
amarisoft_drb.cfg.tmpl: add additional QCI10 with infinit PDCP discard timer
also set QCI9 to 150ms to match default srsENB config
Change-Id: I60cc1390480142bd5bb516934c9f30b6122496d5
---
M src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl
1 file changed, 28 insertions(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl
b/src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl
index d244c8e..455e344 100644
--- a/src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl
+++ b/src/osmo_gsm_tester/templates/amarisoft_drb.cfg.tmpl
@@ -278,7 +278,34 @@
},
},
{
-qci: 9, /* AM - best effort (Internet traffic) */
+qci: 9, /* AM - best effort (Internet traffic) with 150ms PDCP discard */
+pdcp_config: {
+ discardTimer: 150, /* in ms, 0 means infinity */
+ statusReportRequired: true,
+},
+rlc_config: {
+ ul_am: {
+t_PollRetransmit: 80, /* in ms */
+pollPDU: 64,
+pollByte: 125, /* in kBytes, 0 means infinity */
+maxRetxThreshold: 32,
+ },
+ dl_am: {
+t_Reordering: 45, /* in ms, should be > to max_harq_tx * HARQ latency
*/
+t_StatusProhibit: 60, /* in ms */
+ },
+},
+logical_channel_config: {
+ priority: 15,
+ prioritisedBitRate: -1, /* in kb/s, -1 means infinity */
+ bucketSizeDuration: 100, /* in ms */
+ logicalChannelGroup: 3,
+ logicalChannelSR_Mask: false,
+ logicalChannelSR_Prohibit: false,
+},
+ },
+ {
+qci: 10, /* Same like QCI9 but with infinity PDCP discard */
pdcp_config: {
discardTimer: 0, /* in ms, 0 means infinity */
statusReportRequired: true,
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23336
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I60cc1390480142bd5bb516934c9f30b6122496d5
Gerrit-Change-Number: 23336
Gerrit-PatchSet: 3
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: srsenb_drb.conf.tmpl: set PDCP discard timer to 150ms for QCI9
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23335 )
Change subject: srsenb_drb.conf.tmpl: set PDCP discard timer to 150ms for QCI9
..
srsenb_drb.conf.tmpl: set PDCP discard timer to 150ms for QCI9
srsENB now supports PDCP discard so we set it to a sane value.
Also enable status reporting for UL.
Change-Id: Ib6ad0ff57b95a1f220f87c1ede0f6eacc5fb21ff
---
M src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl
b/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl
index b10ef31..a171a5e 100644
--- a/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsenb_drb.conf.tmpl
@@ -72,8 +72,8 @@
{
qci=9;
pdcp_config = {
-discard_timer = -1;
-status_report_required = false;
+discard_timer = 150;
+status_report_required = true;
}
rlc_config = {
ul_am = {
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23335
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Ib6ad0ff57b95a1f220f87c1ede0f6eacc5fb21ff
Gerrit-Change-Number: 23335
Gerrit-PatchSet: 3
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: {enb, ms}-label.conf: raneme and add modifier to select eNB/MS based o...
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23334 )
Change subject: {enb,ms}-label.conf: raneme and add modifier to select eNB/MS
based on label
..
{enb,ms}-label.conf: raneme and add modifier to select eNB/MS based on label
Change-Id: I26ea160b65b9dd5ef3e5ca1100d4541a0bbcbb27
---
A sysmocom/scenarios/enb-label@.conf
R sysmocom/scenarios/ms-label@.conf
2 files changed, 3 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/sysmocom/scenarios/enb-label@.conf
b/sysmocom/scenarios/enb-label@.conf
new file mode 100644
index 000..8470c57
--- /dev/null
+++ b/sysmocom/scenarios/enb-label@.conf
@@ -0,0 +1,3 @@
+resources:
+ enb:
+ - label: ${param1}
\ No newline at end of file
diff --git a/sysmocom/scenarios/ms-label.conf
b/sysmocom/scenarios/ms-label@.conf
similarity index 100%
rename from sysmocom/scenarios/ms-label.conf
rename to sysmocom/scenarios/ms-label@.conf
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23334
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I26ea160b65b9dd5ef3e5ca1100d4541a0bbcbb27
Gerrit-Change-Number: 23334
Gerrit-PatchSet: 3
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: enb.py: increase zmq trx timeout to 4000ms
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/2 ) Change subject: enb.py: increase zmq trx timeout to 4000ms .. enb.py: increase zmq trx timeout to 4000ms with many parallel jobs running on one machine we should relax the timeout a bit to avoid false positives. Change-Id: Ib32a07559bd5a4b0165f6d3431c5ac57cc050f44 --- M src/osmo_gsm_tester/obj/enb.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py index 15a0033..99d43f8 100644 --- a/src/osmo_gsm_tester/obj/enb.py +++ b/src/osmo_gsm_tester/obj/enb.py @@ -266,7 +266,7 @@ else: ul_rem_addr = self.ue.addr() -rf_dev_args = 'fail_on_disconnect=true' +rf_dev_args = 'fail_on_disconnect=true,log_trx_timeout=true,trx_timeout_ms=4000' idx = 0 cell_list = cfg_values['enb']['cell_list'] # Define all 8 possible RF ports (2x CA with 2x2 MIMO) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/2 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib32a07559bd5a4b0165f6d3431c5ac57cc050f44 Gerrit-Change-Number: 2 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: enb,epc,ms: refactor KPI API
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 )
Change subject: enb,epc,ms: refactor KPI API
..
enb,epc,ms: refactor KPI API
we previously mixed component specific and component agnostic APIs
(stdout vs. log file for example) for setting and retrieving KPI.
This patch propose to use a single abstract get_kpis() method for
all components that can be enriched with component-specific
stuff as desired.
In the case of srsLTE blocks, the main implementation will
remain in srslte_common() and is shared among srsENB/srsUE/srsEPC.
The KPI analyzer in srslte_common() extract and also manages
all three KPI sources (log, csv and stdout) independently.
In addition to the get_kpis() method that always returns a flat
dictionary, it also exposes get_kpi_tree() that return
a dict of KPI dicts that will be used for the Junit.xml generation.
Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265
---
M src/osmo_gsm_tester/obj/enb.py
M src/osmo_gsm_tester/obj/enb_amarisoft.py
M src/osmo_gsm_tester/obj/enb_srs.py
M src/osmo_gsm_tester/obj/epc.py
M src/osmo_gsm_tester/obj/epc_amarisoft.py
M src/osmo_gsm_tester/obj/epc_srs.py
M src/osmo_gsm_tester/obj/ms_srs.py
M src/osmo_gsm_tester/obj/srslte_common.py
8 files changed, 56 insertions(+), 45 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py
index 32ead69..15a0033 100644
--- a/src/osmo_gsm_tester/obj/enb.py
+++ b/src/osmo_gsm_tester/obj/enb.py
@@ -356,4 +356,8 @@
def get_counter(self, counter_name):
pass
-# vim: expandtab tabstop=4 shiftwidth=4
+@abstractmethod
+def get_kpis(self):
+pass
+
+# vim: expandtab tabstop=4 shiftwidth=4
\ No newline at end of file
diff --git a/src/osmo_gsm_tester/obj/enb_amarisoft.py
b/src/osmo_gsm_tester/obj/enb_amarisoft.py
index e97bb90..01aed18 100644
--- a/src/osmo_gsm_tester/obj/enb_amarisoft.py
+++ b/src/osmo_gsm_tester/obj/enb_amarisoft.py
@@ -260,6 +260,9 @@
return self.process.get_counter_stdout('PRACH:')
raise log.Error('counter %s not implemented!' % counter_name)
+def get_kpis(self):
+return {}
+
def get_rfemu(self, cell=0, dl=True):
cell_list = self.gen_conf['enb'].get('cell_list', None)
if cell_list is None or len(cell_list) < cell + 1:
diff --git a/src/osmo_gsm_tester/obj/enb_srs.py
b/src/osmo_gsm_tester/obj/enb_srs.py
index aee3f61..83df5ed 100644
--- a/src/osmo_gsm_tester/obj/enb_srs.py
+++ b/src/osmo_gsm_tester/obj/enb_srs.py
@@ -101,7 +101,7 @@
self.log(repr(e))
# Collect KPIs for each TC
-self.testenv.test().set_kpis(self.get_kpis())
+self.testenv.test().set_kpis(self.get_kpi_tree())
# Clean up for parent class:
super().cleanup()
@@ -267,6 +267,9 @@
return self.process.get_counter_stdout('RACH:')
raise log.Error('counter %s not implemented!' % counter_name)
+def get_kpis(self):
+return srslte_common.get_kpis(self)
+
def get_rfemu(self, cell=0, dl=True):
cell_list = self.gen_conf['enb'].get('cell_list', None)
if cell_list is None or len(cell_list) < cell + 1:
diff --git a/src/osmo_gsm_tester/obj/epc.py b/src/osmo_gsm_tester/obj/epc.py
index 6f056fc..aaa96b7 100644
--- a/src/osmo_gsm_tester/obj/epc.py
+++ b/src/osmo_gsm_tester/obj/epc.py
@@ -116,4 +116,8 @@
def run_node(self):
return self._run_node
+@abstractmethod
+def get_kpis(self):
+pass
+
# vim: expandtab tabstop=4 shiftwidth=4
diff --git a/src/osmo_gsm_tester/obj/epc_amarisoft.py
b/src/osmo_gsm_tester/obj/epc_amarisoft.py
index 1291891..4c3bf07 100644
--- a/src/osmo_gsm_tester/obj/epc_amarisoft.py
+++ b/src/osmo_gsm_tester/obj/epc_amarisoft.py
@@ -199,4 +199,7 @@
# TODO: set proper addr
return '192.168.4.1'
+def get_kpis(self):
+return {}
+
# vim: expandtab tabstop=4 shiftwidth=4
diff --git a/src/osmo_gsm_tester/obj/epc_srs.py
b/src/osmo_gsm_tester/obj/epc_srs.py
index 6a7a20e..6a0a7bb 100644
--- a/src/osmo_gsm_tester/obj/epc_srs.py
+++ b/src/osmo_gsm_tester/obj/epc_srs.py
@@ -219,4 +219,7 @@
def tun_addr(self):
return '172.16.0.1'
+def get_kpis(self):
+return srslte_common.get_kpis(self)
+
# vim: expandtab tabstop=4 shiftwidth=4
diff --git a/src/osmo_gsm_tester/obj/ms_srs.py
b/src/osmo_gsm_tester/obj/ms_srs.py
index 2f19f3f..aaeeca5 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -126,7 +126,7 @@
self.log(repr(e))
# Collect KPIs for each TC
-self.testenv.test().set_kpis(self.get_kpis())
+self.testenv.test().set_kpis(self.get_kpi_tree())
def features(self):
return self._conf.get('features', [])
diff --git a/src/osmo_gsm_tester/obj/srslte_common.py
Change in osmo-gsm-tester[master]: jenkins-build-amarisoft: copy ltesim_server binary into epc trial tgz
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23341 ) Change subject: jenkins-build-amarisoft: copy ltesim_server binary into epc trial tgz .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I21ac57d1c1547c1cf4d2394c8593f58ff2c78697 Gerrit-Change-Number: 23341 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:05:39 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srsenb_sib.conf.tmpl: reduce the default size of the PUCCH
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23340 ) Change subject: srsenb_sib.conf.tmpl: reduce the default size of the PUCCH .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23340 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I45ae7c33f9d1df20df37c0fe6c3d73aa85ae1b31 Gerrit-Change-Number: 23340 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:05:37 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srsue.conf.tmpl: Adjust ue.config template for new pcap path
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23339 ) Change subject: srsue.conf.tmpl: Adjust ue.config template for new pcap path .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4af6abaa3973652a12f571d88bca59cd443704f3 Gerrit-Change-Number: 23339 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:05:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: ms_srs: add config scheme to select NAS log level
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23338 ) Change subject: ms_srs: add config scheme to select NAS log level .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Iab2bce65e8af81f6d344849c97952e6441cb2846 Gerrit-Change-Number: 23338 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:05:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srsenb_drb.conf.tmpl: add QCI10 with infinit PDCP discard timer
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23337 ) Change subject: srsenb_drb.conf.tmpl: add QCI10 with infinit PDCP discard timer .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I64a74d09cc1a55ba21a7be7b5cc203e56bba3b10 Gerrit-Change-Number: 23337 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:05:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: amarisoft_drb.cfg.tmpl: add additional QCI10 with infinit PDCP discar...
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23336 ) Change subject: amarisoft_drb.cfg.tmpl: add additional QCI10 with infinit PDCP discard timer .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23336 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I60cc1390480142bd5bb516934c9f30b6122496d5 Gerrit-Change-Number: 23336 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:05:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srsenb_drb.conf.tmpl: set PDCP discard timer to 150ms for QCI9
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23335 ) Change subject: srsenb_drb.conf.tmpl: set PDCP discard timer to 150ms for QCI9 .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib6ad0ff57b95a1f220f87c1ede0f6eacc5fb21ff Gerrit-Change-Number: 23335 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:05:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: {enb, ms}-label.conf: raneme and add modifier to select eNB/MS based o...
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23334 )
Change subject: {enb,ms}-label.conf: raneme and add modifier to select eNB/MS
based on label
..
Patch Set 3: Verified+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23334
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I26ea160b65b9dd5ef3e5ca1100d4541a0bbcbb27
Gerrit-Change-Number: 23334
Gerrit-PatchSet: 3
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Tue, 16 Mar 2021 17:05:22 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: enb.py: increase zmq trx timeout to 4000ms
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/2 ) Change subject: enb.py: increase zmq trx timeout to 4000ms .. Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/2 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib32a07559bd5a4b0165f6d3431c5ac57cc050f44 Gerrit-Change-Number: 2 Gerrit-PatchSet: 3 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:05:18 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: enb,epc,ms: refactor KPI API
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 ) Change subject: enb,epc,ms: refactor KPI API .. Patch Set 8: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/22600 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I4bacc6b8a0cb92a581edfb947100b57022265265 Gerrit-Change-Number: 22600 Gerrit-PatchSet: 8 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:05:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: ms_srs: add config scheme to select NAS log level
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23338 ) Change subject: ms_srs: add config scheme to select NAS log level .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23338 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Iab2bce65e8af81f6d344849c97952e6441cb2846 Gerrit-Change-Number: 23338 Gerrit-PatchSet: 2 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 17:01:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: {enb, ms}-label.conf: raneme and add modifier to select eNB/MS based o...
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23334 )
Change subject: {enb,ms}-label.conf: raneme and add modifier to select eNB/MS
based on label
..
Patch Set 2: Verified+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23334
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I26ea160b65b9dd5ef3e5ca1100d4541a0bbcbb27
Gerrit-Change-Number: 23334
Gerrit-PatchSet: 2
Gerrit-Owner: srs_andre
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Tue, 16 Mar 2021 17:01:29 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in docker-playground[master]: Add debian-buster-jenkins docker setup
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23381 ) Change subject: Add debian-buster-jenkins docker setup .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23381 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ibfdec6007357a90212dea7d39300f04ce8ffdf65 Gerrit-Change-Number: 23381 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 16:48:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: srslte_common: fix condition to check if KPI have already extracted
srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23385 ) Change subject: srslte_common: fix condition to check if KPI have already extracted .. srslte_common: fix condition to check if KPI have already extracted Change-Id: I6fdcbfadfdcfe131096d0345d2c21c87f8f7b1b6 --- M src/osmo_gsm_tester/obj/srslte_common.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/85/23385/1 diff --git a/src/osmo_gsm_tester/obj/srslte_common.py b/src/osmo_gsm_tester/obj/srslte_common.py index cbc360f..aa41cd2 100644 --- a/src/osmo_gsm_tester/obj/srslte_common.py +++ b/src/osmo_gsm_tester/obj/srslte_common.py @@ -65,7 +65,7 @@ ''' Use the srsLTE KPI analyzer module (part of srsLTE.git) if available to collect KPIs ''' # Make sure this only runs once -if self.csv_kpi is not None or self.log_kpi is not None or self.stdout_kpi is not None: +if self.csv_kpi is not None and self.log_kpi is not None and self.stdout_kpi is not None: return # Start with empty KPIs -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I6fdcbfadfdcfe131096d0345d2c21c87f8f7b1b6 Gerrit-Change-Number: 23385 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: enb.py: increase ZMQ trx timeout to 8s
srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23384 ) Change subject: enb.py: increase ZMQ trx timeout to 8s .. enb.py: increase ZMQ trx timeout to 8s increase value further to avoid failed tests due to load on system Change-Id: I77b7864e7ef60faf0262dc24325915d73dd2d5a3 --- M src/osmo_gsm_tester/obj/enb.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/84/23384/1 diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py index 99d43f8..80f7b6e 100644 --- a/src/osmo_gsm_tester/obj/enb.py +++ b/src/osmo_gsm_tester/obj/enb.py @@ -266,7 +266,7 @@ else: ul_rem_addr = self.ue.addr() -rf_dev_args = 'fail_on_disconnect=true,log_trx_timeout=true,trx_timeout_ms=4000' +rf_dev_args = 'fail_on_disconnect=true,log_trx_timeout=true,trx_timeout_ms=8000' idx = 0 cell_list = cfg_values['enb']['cell_list'] # Define all 8 possible RF ports (2x CA with 2x2 MIMO) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23384 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I77b7864e7ef60faf0262dc24325915d73dd2d5a3 Gerrit-Change-Number: 23384 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: iperf3_bidir: add extra test for bi-directional iperf test
srs_andre has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23382 )
Change subject: iperf3_bidir: add extra test for bi-directional iperf test
..
iperf3_bidir: add extra test for bi-directional iperf test
Change-Id: Ibb62f53dbb15bc4788c92ebb2dee70e31dd851de
---
A sysmocom/suites/4g/iperf3_bidir.py
1 file changed, 45 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/82/23382/1
diff --git a/sysmocom/suites/4g/iperf3_bidir.py
b/sysmocom/suites/4g/iperf3_bidir.py
new file mode 100755
index 000..bb1d73a
--- /dev/null
+++ b/sysmocom/suites/4g/iperf3_bidir.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+from osmo_gsm_tester.testenv import *
+
+epc = tenv.epc()
+enb = tenv.enb()
+ue = tenv.modem()
+iperf3srv = tenv.iperf3srv({'addr': epc.tun_addr()})
+iperf3srv.set_run_node(epc.run_node())
+iperf3cli = iperf3srv.create_client()
+iperf3cli.set_run_node(ue.run_node())
+
+epc.subscriber_add(ue)
+epc.start()
+enb.ue_add(ue)
+enb.start(epc)
+
+print('waiting for ENB to connect to EPC...')
+wait(epc.enb_is_connected, enb)
+print('ENB is connected to EPC')
+
+ue.connect(enb)
+
+max_rate_ratio = 0.8
+max_rate_dl = enb.ue_max_rate(downlink=True, num_carriers=ue.num_carriers)
+max_rate_ul = enb.ue_max_rate(downlink=False, num_carriers=ue.num_carriers)
+
+iperf3srv.start()
+proc = iperf3cli.prepare_test_proc(iperf3cli.DIR_BI, ue.netns(),
bitrate=max_rate_dl)
+
+print('waiting for UE to attach...')
+wait(ue.is_registered)
+print('UE is attached')
+
+print("Running iperf3 client to %s through %s" % (str(iperf3cli), ue.netns()))
+proc.launch_sync()
+iperf3srv.stop()
+
+iperf3cli.print_results()
+iperf3srv.print_results(iperf3cli.proto() == iperf3cli.PROTO_UDP)
+
+# 80% of the maximum rate for half of the test duration
+half_duration = int(round(iperf3cli.time_sec() / 2))
+res_str = ue.verify_metric((max_rate_dl + max_rate_ul) * max_rate_ratio,
operation='max_rolling_avg', metric='dl_brate+ul_brate', criterion='gt',
window=half_duration)
+print(res_str)
+test.set_report_stdout(res_str)
\ No newline at end of file
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23382
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Ibb62f53dbb15bc4788c92ebb2dee70e31dd851de
Gerrit-Change-Number: 23382
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: ms_srs: add force_ul_amplitude config
srs_andre has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23383 )
Change subject: ms_srs: add force_ul_amplitude config
..
ms_srs: add force_ul_amplitude config
this allows to overwrite the PHY export option phy.force_ul_amplitude
Change-Id: I255f027433944c1739c89757609f0dcc3b8aa7cb
---
M src/osmo_gsm_tester/obj/ms_srs.py
M src/osmo_gsm_tester/templates/srsue.conf.tmpl
2 files changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/83/23383/1
diff --git a/src/osmo_gsm_tester/obj/ms_srs.py
b/src/osmo_gsm_tester/obj/ms_srs.py
index 745a18e..9390470 100644
--- a/src/osmo_gsm_tester/obj/ms_srs.py
+++ b/src/osmo_gsm_tester/obj/ms_srs.py
@@ -43,7 +43,8 @@
'rx_gain': schema.INT,
'freq_offset': schema.INT,
'dl_freq': schema.STR,
-'ul_freq': schema.STR
+'ul_freq': schema.STR,
+'force_ul_amplitude': schema.STR
}
for key, val in RunNode.schema().items():
resource_schema['run_node.%s' % key] = val
diff --git a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
index 784cf03..135fa06 100644
--- a/src/osmo_gsm_tester/templates/srsue.conf.tmpl
+++ b/src/osmo_gsm_tester/templates/srsue.conf.tmpl
@@ -363,7 +363,9 @@
#pregenerate_signals = false
#pdsch_csi_enabled = true
#pdsch_8bit_decoder = false
-#force_ul_amplitude = 0
+% if float(ue.force_ul_amplitude) > 0:
+force_ul_amplitude = ${ue.force_ul_amplitude}
+% endif
#
# Simulation configuration options
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23383
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I255f027433944c1739c89757609f0dcc3b8aa7cb
Gerrit-Change-Number: 23383
Gerrit-PatchSet: 1
Gerrit-Owner: srs_andre
Gerrit-MessageType: newchange
Change in docker-playground[master]: Add debian-buster-jenkins docker setup
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/23381 )
Change subject: Add debian-buster-jenkins docker setup
..
Add debian-buster-jenkins docker setup
It will be used by osmo-gsm-tester docker image right now, and at some
point in the future jenkins nodes will also migrate to it.
Change-Id: Ibfdec6007357a90212dea7d39300f04ce8ffdf65
---
A debian-buster-jenkins/Dockerfile
A debian-buster-jenkins/Makefile
2 files changed, 187 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/81/23381/1
diff --git a/debian-buster-jenkins/Dockerfile b/debian-buster-jenkins/Dockerfile
new file mode 100644
index 000..baa076a
--- /dev/null
+++ b/debian-buster-jenkins/Dockerfile
@@ -0,0 +1,186 @@
+# Image used to run contrib/jenkins.sh scripts of most Osmocom projects.
+# See master-builds.yml, gerrit-verifications.yml in osmo-ci.git.
+
+ARGDEBIAN_VERSION=buster
+ARGREGISTRY=docker.io
+FROM ${REGISTRY}/debian:${DEBIAN_VERSION}
+# Arguments used after FROM must be specified again
+ARGOSMOCOM_REPO_MIRROR="http://download.opensuse.org;
+
+# Make "$DEBIAN_VERSION" available after FROM
+#
https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
+ARG DEBIAN_VERSION
+
+# Install apt dependencies (keep in alphabetic order)
+RUN \
+ dpkg --add-architecture i386 && \
+ DEBIAN_FRONTEND=noninteractive apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y
--no-install-recommends \
+ asciidoc \
+ asciidoc-dblatex \
+ autoconf \
+ autoconf-archive \
+ automake \
+ bc \
+ bison \
+ bzip2 \
+ cmake \
+ coccinelle \
+ cppcheck \
+ dahdi-source \
+ dblatex \
+ dbus \
+ debhelper \
+ devscripts \
+ dh-autoreconf \
+ dh-systemd \
+ docbook5-xml \
+ doxygen \
+ flex \
+ g++ \
+ gawk \
+ gcc \
+ gcc-arm-none-eabi \
+ git \
+ git-buildpackage \
+ graphviz \
+ htop \
+ inkscape \
+ lcov \
+ libaio-dev \
+ libasound2-dev \
+ libboost-all-dev \
+ libc-ares-dev \
+ libcsv-dev \
+ libdbd-sqlite3 \
+ libdbi-dev \
+ libffi-dev \
+ libfftw3-dev \
+ libgmp-dev \
+ libgnutls28-dev \
+ libgps-dev \
+ libgsm1-dev \
+ libjansson-dev \
+ liblua5.3-dev \
+ libmnl-dev \
+ libncurses5-dev \
+ libnewlib-arm-none-eabi \
+ libnl-3-dev \
+ libnl-route-3-dev \
+ liboping-dev \
+ libortp-dev \
+ libpcap-dev \
+ libpcsclite-dev \
+ libreadline-dev \
+ libsctp-dev \
+ libsigsegv-dev \
+ libsnmp-dev \
+ libsofia-sip-ua-glib-dev \
+ libsqlite3-dev \
+ libssl-dev \
+ libtalloc-dev \
+ libtool \
+ libusb-1.0-0-dev \
+ libusb-dev \
+ libxml2-utils \
+ libzmq3-dev \
+ locales \
+ lua-socket \
+ make \
+ mscgen \
+ ofono \
+ openssh-client \
+ osc \
+ patchelf \
+ pkg-config \
+ python3 \
+ python3-gi \
+ python3-mako \
+ python3-nwdiag \
+ python3-pip \
+ python3-pyflakes \
+ python3-setuptools \
+ python3-usb \
+ python3-yaml \
+ python2.7 \
+ python-pip \
+ python-setuptools \
+ python-yaml \
+ rsync \
+ sdcc \
+ sqlite3 \
+ source-highlight \
+ stow \
+ sudo \
+ systemd \
+ tcpdump \
+ texinfo \
+ unzip \
+ wget \
+ xsltproc
+
+# Install pip dependencies (keep in alphabetic order)
+RUN pip3 install \
+ git+https://github.com/podshumok/python-smpplib.git \
+ git+https://github.com/eriwen/lcov-to-cobertura-xml.git \
+ pydbus \
+ pysispm
+
+# match the outside user
+RUN useradd --uid=1000 build
+#RUN echo "build ALL=(ALL) NOPASSWD:ALL" >
Change in osmo-gsm-tester[master]: sysmo/defaults.conf: Fix attribute name
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23380 ) Change subject: sysmo/defaults.conf: Fix attribute name .. sysmo/defaults.conf: Fix attribute name According to schema, the name is cipher_list. Same goes for "integrity". Fixes: a81801558e7bb6ef0f0a32ab078d302c91e940a8 Change-Id: Ib7b48ce207b96ea5f5b59db08320563be40edba1 --- M sysmocom/defaults.conf 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/80/23380/1 diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf index d66e030..a14b707 100644 --- a/sysmocom/defaults.conf +++ b/sysmocom/defaults.conf @@ -144,11 +144,11 @@ root_seq_idx: 205 scell_list: [] ncell_list: [] - cipher_4g: + cipher_list: - eea0 - eea2 - eea1 - integrity_4g: + integrity_list: - eia2 - eia1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Ib7b48ce207b96ea5f5b59db08320563be40edba1 Gerrit-Change-Number: 23380 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in docker-playground[master]: fr: kill the frnet container before trying to 'rm' it
laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/23379 )
Change subject: fr: kill the frnet container before trying to 'rm' it
..
fr: kill the frnet container before trying to 'rm' it
+ docker container rm jenkins-ttcn3-fr-test-109-frnet
jenkins-ttcn3-fr-test-109-ttcn3-fr-test
jenkins-ttcn3-fr-test-109-ttcn3-fr-test
Error response from daemon: You cannot remove a running container
4f5ec7f412b2d37d00b2738b2bcddffada36efebfe7ce32ed196543ee436154e. Stop the
container before attempting removal or force remove
Change-Id: I66ed0d073bdd6962f78da54232d6bc58adc09e2c
---
M ttcn3-fr-test/jenkins.sh
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh
index bfe775f..c878000 100755
--- a/ttcn3-fr-test/jenkins.sh
+++ b/ttcn3-fr-test/jenkins.sh
@@ -63,6 +63,8 @@
# emulate running container in foreground, which is no longer possible as we
# must shift the net-devices into the container _after_ it is started
docker logs-f ${BUILD_TAG}-ttcn3-fr-test
+# kill the frnet container to avoid "You cannot remove a running container "
below in 'rm'
+docker kill ${BUILD_TAG}-frnet
# store execution logs for both containers
docker logs --timestamps ${BUILD_TAG}-ttcn3-fr-test >
$VOL_BASE_DIR/fr-tester/exec.log
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23379
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I66ed0d073bdd6962f78da54232d6bc58adc09e2c
Gerrit-Change-Number: 23379
Gerrit-PatchSet: 2
Gerrit-Owner: laforge
Gerrit-Reviewer: laforge
Gerrit-CC: fixeria
Gerrit-CC: osmith
Gerrit-MessageType: merged
Change in docker-playground[master]: fr: kill the frnet container before trying to 'rm' it
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23379 ) Change subject: fr: kill the frnet container before trying to 'rm' it .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23379 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I66ed0d073bdd6962f78da54232d6bc58adc09e2c Gerrit-Change-Number: 23379 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 16 Mar 2021 16:23:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: fr: kill the frnet container before trying to 'rm' it
laforge has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/23379 )
Change subject: fr: kill the frnet container before trying to 'rm' it
..
fr: kill the frnet container before trying to 'rm' it
+ docker container rm jenkins-ttcn3-fr-test-109-frnet
jenkins-ttcn3-fr-test-109-ttcn3-fr-test
jenkins-ttcn3-fr-test-109-ttcn3-fr-test
Error response from daemon: You cannot remove a running container
4f5ec7f412b2d37d00b2738b2bcddffada36efebfe7ce32ed196543ee436154e. Stop the
container before attempting removal or force remove
Change-Id: I66ed0d073bdd6962f78da54232d6bc58adc09e2c
---
M ttcn3-fr-test/jenkins.sh
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/79/23379/1
diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh
index bfe775f..c878000 100755
--- a/ttcn3-fr-test/jenkins.sh
+++ b/ttcn3-fr-test/jenkins.sh
@@ -63,6 +63,8 @@
# emulate running container in foreground, which is no longer possible as we
# must shift the net-devices into the container _after_ it is started
docker logs-f ${BUILD_TAG}-ttcn3-fr-test
+# kill the frnet container to avoid "You cannot remove a running container "
below in 'rm'
+docker kill ${BUILD_TAG}-frnet
# store execution logs for both containers
docker logs --timestamps ${BUILD_TAG}-ttcn3-fr-test >
$VOL_BASE_DIR/fr-tester/exec.log
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23379
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I66ed0d073bdd6962f78da54232d6bc58adc09e2c
Gerrit-Change-Number: 23379
Gerrit-PatchSet: 1
Gerrit-Owner: laforge
Gerrit-MessageType: newchange
Change in pysim[master]: filesystem: be more strict in method add_file()
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/23378 )
Change subject: filesystem: be more strict in method add_file()
..
filesystem: be more strict in method add_file()
The file identifier of a file is strictly defined as a two digit
hexadecimal number. Do not allow adding child files that violate this
constraint.
Since the human readable name also plays a major role in identifying
the type of the file (ADF, EF or DF) ensure that when adding files it
is ensured that the file actually has a name and that the name starts
with "DF.", "EF." or "ADF.".
Change-Id: I096907285b742e611d221b03ba067ea2522e7e52
Related: OS#4963
---
M pySim/filesystem.py
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/78/23378/1
diff --git a/pySim/filesystem.py b/pySim/filesystem.py
index fa1e02c..1957dbf 100644
--- a/pySim/filesystem.py
+++ b/pySim/filesystem.py
@@ -31,7 +31,7 @@
from cmd2 import CommandSet, with_default_category, with_argparser
import argparse
-from pySim.utils import sw_match, h2b, b2h
+from pySim.utils import sw_match, h2b, b2h, is_hex
from pySim.exceptions import *
class CardFile(object):
@@ -145,6 +145,12 @@
"""Add a child (DF/EF) to this DF"""
if not isinstance(child, CardFile):
raise TypeError("Expected a File instance")
+if not is_hex(child.fid, minlen = 4, maxlen = 8):
+raise ValueError("File name %s is not a valid fid" % (child.fid))
+if child.name is None:
+raise ValueError("File fid %s has no human readable name" %
(child.fid))
+if child.name[0:3] != "DF." and child.name[0:3] != "EF." and
child.name[0:4] != "ADF.":
+raise ValueError("File name %s does not start with \"DF.\",
\"EF.\" or \"ADF.\"" % (child.name))
if child.name in CardFile.RESERVED_NAMES:
raise ValueError("File name %s is a reserved name" % (child.name))
if child.fid in CardFile.RESERVED_FIDS:
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/23378
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I096907285b742e611d221b03ba067ea2522e7e52
Gerrit-Change-Number: 23378
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
Change in pysim[master]: filesystem: add comment to inform about checks in add_file()
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/23377 ) Change subject: filesystem: add comment to inform about checks in add_file() .. filesystem: add comment to inform about checks in add_file() The method add_file of class CardDF does some constraint checking to the basic file parameters (e.g. fid). Since one might also expect those checks in the superclass CardFile lets leave a comment to make the code better understandable. Change-Id: Iebae28909fe6aade3bd4024112a222819572d735 Related: OS#4963 --- M pySim/filesystem.py 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/77/23377/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index bbead96..fa1e02c 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -55,6 +55,10 @@ self.parent.add_file(self) self.shell_commands = [] + # Note: the basic properties (fid, name, ect.) are verified when + # the file is attached to a parent file. See method add_file() in + # class Card DF + def __str__(self): if self.name: return self.name -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iebae28909fe6aade3bd4024112a222819572d735 Gerrit-Change-Number: 23377 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange
Change in pysim[master]: filesystem: fix exception string (fid != name)
dexter has uploaded this change for review. (
https://gerrit.osmocom.org/c/pysim/+/23376 )
Change subject: filesystem: fix exception string (fid != name)
..
filesystem: fix exception string (fid != name)
It is better to use the term "fid" instead of "name" when a reserved FID
is detected.
Change-Id: I054f3b3a156f0164c62610cfde1aec2145c20925
Related: OS#4963
---
M pySim/filesystem.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/76/23376/1
diff --git a/pySim/filesystem.py b/pySim/filesystem.py
index 504d66d..bbead96 100644
--- a/pySim/filesystem.py
+++ b/pySim/filesystem.py
@@ -144,7 +144,7 @@
if child.name in CardFile.RESERVED_NAMES:
raise ValueError("File name %s is a reserved name" % (child.name))
if child.fid in CardFile.RESERVED_FIDS:
-raise ValueError("File fid %s is a reserved name" % (child.fid))
+raise ValueError("File fid %s is a reserved fid" % (child.fid))
if child.fid in self.children:
if ignore_existing:
return
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/23376
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I054f3b3a156f0164c62610cfde1aec2145c20925
Gerrit-Change-Number: 23376
Gerrit-PatchSet: 1
Gerrit-Owner: dexter
Gerrit-MessageType: newchange
Change in docker-playground[master]: ogt: Drop old arfcn leftovers from resources.conf
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23375 ) Change subject: ogt: Drop old arfcn leftovers from resources.conf .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0cbcd0f3df92393f03f29c81013e1f4b6b9aa830 Gerrit-Change-Number: 23375 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 15:52:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ogt: Drop old arfcn leftovers from resources.conf
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23375 ) Change subject: ogt: Drop old arfcn leftovers from resources.conf .. ogt: Drop old arfcn leftovers from resources.conf Those arfcn objects were never really used smartly and new versions of OGT don't support it. Change-Id: I0cbcd0f3df92393f03f29c81013e1f4b6b9aa830 --- M osmo-gsm-tester/resources.conf 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/osmo-gsm-tester/resources.conf b/osmo-gsm-tester/resources.conf index 22ff85e..d10cc1e 100644 --- a/osmo-gsm-tester/resources.conf +++ b/osmo-gsm-tester/resources.conf @@ -43,10 +43,6 @@ ssh_user: jenkins ssh_addr: 172.18.50.101 -arfcn: - - arfcn: 512 -band: GSM-1800 - modem: - label: sierra_1st path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.2' -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0cbcd0f3df92393f03f29c81013e1f4b6b9aa830 Gerrit-Change-Number: 23375 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in docker-playground[master]: ogt: Drop old arfcn leftovers from resources.conf
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23375 ) Change subject: ogt: Drop old arfcn leftovers from resources.conf .. ogt: Drop old arfcn leftovers from resources.conf Those arfcn objects were never really used smartly and new versions of OGT don't support it. Change-Id: I0cbcd0f3df92393f03f29c81013e1f4b6b9aa830 --- M osmo-gsm-tester/resources.conf 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/75/23375/1 diff --git a/osmo-gsm-tester/resources.conf b/osmo-gsm-tester/resources.conf index 22ff85e..d10cc1e 100644 --- a/osmo-gsm-tester/resources.conf +++ b/osmo-gsm-tester/resources.conf @@ -43,10 +43,6 @@ ssh_user: jenkins ssh_addr: 172.18.50.101 -arfcn: - - arfcn: 512 -band: GSM-1800 - modem: - label: sierra_1st path: '/sys/devices/pci:00/:00:12.2/usb1/1-5/1-5.4/1-5.4.1/1-5.4.1.2' -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I0cbcd0f3df92393f03f29c81013e1f4b6b9aa830 Gerrit-Change-Number: 23375 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in libosmocore[master]: gprs_ns2: add vty `nse <0-65535> restart sns`
lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23184 ) Change subject: gprs_ns2: add vty `nse <0-65535> restart sns` .. Patch Set 1: This command can be also used by operators. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icb55d8449908d348ab10572eebcf971737fba00d Gerrit-Change-Number: 23184 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 15:40:07 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-docker-prepare.sh: fix handling of multiple PROJECTs
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23374 ) Change subject: ttcn3-docker-prepare.sh: fix handling of multiple PROJECTs .. ttcn3-docker-prepare.sh: fix handling of multiple PROJECTs Change-Id: Ib921d7c5cb2c628f3eca8d5c886375f3288e1dd6 --- M debian-stretch-titan/ttcn3-docker-prepare.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/debian-stretch-titan/ttcn3-docker-prepare.sh b/debian-stretch-titan/ttcn3-docker-prepare.sh index a5cbc91..e4144e2 100755 --- a/debian-stretch-titan/ttcn3-docker-prepare.sh +++ b/debian-stretch-titan/ttcn3-docker-prepare.sh @@ -11,7 +11,7 @@ set -x OSMO_TTCN3_BRANCH=$1 -PROJECT=$2 +shift cd /osmo-ttcn3-hacks @@ -37,4 +37,4 @@ ln -sv "/osmo-ttcn3-hacks/$i" "/$i" done -make "$PROJECT" +make $@ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib921d7c5cb2c628f3eca8d5c886375f3288e1dd6 Gerrit-Change-Number: 23374 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged
Change in docker-playground[master]: ttcn3-docker-prepare.sh: fix handling of multiple PROJECTs
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23374 ) Change subject: ttcn3-docker-prepare.sh: fix handling of multiple PROJECTs .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib921d7c5cb2c628f3eca8d5c886375f3288e1dd6 Gerrit-Change-Number: 23374 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 16 Mar 2021 15:10:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-docker-prepare.sh: fix handling of multiple PROJECTs
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/23374 ) Change subject: ttcn3-docker-prepare.sh: fix handling of multiple PROJECTs .. ttcn3-docker-prepare.sh: fix handling of multiple PROJECTs Change-Id: Ib921d7c5cb2c628f3eca8d5c886375f3288e1dd6 --- M debian-stretch-titan/ttcn3-docker-prepare.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/74/23374/1 diff --git a/debian-stretch-titan/ttcn3-docker-prepare.sh b/debian-stretch-titan/ttcn3-docker-prepare.sh index a5cbc91..e4144e2 100755 --- a/debian-stretch-titan/ttcn3-docker-prepare.sh +++ b/debian-stretch-titan/ttcn3-docker-prepare.sh @@ -11,7 +11,7 @@ set -x OSMO_TTCN3_BRANCH=$1 -PROJECT=$2 +shift cd /osmo-ttcn3-hacks @@ -37,4 +37,4 @@ ln -sv "/osmo-ttcn3-hacks/$i" "/$i" done -make "$PROJECT" +make $@ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib921d7c5cb2c628f3eca8d5c886375f3288e1dd6 Gerrit-Change-Number: 23374 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in docker-playground[master]: ttcn3-fr-test: store execution logs for both containers
laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/23373 )
Change subject: ttcn3-fr-test: store execution logs for both containers
..
ttcn3-fr-test: store execution logs for both containers
Change-Id: I60e60bfdc9f6b8fde81189d35d0ca4e73e310cc7
---
M ttcn3-fr-test/jenkins.sh
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh
index 1e383e5..bfe775f 100755
--- a/ttcn3-fr-test/jenkins.sh
+++ b/ttcn3-fr-test/jenkins.sh
@@ -23,7 +23,7 @@
mkdir $VOL_BASE_DIR/unix
echo Starting container with FRNET
-docker run --rm \
+docker run \
--cap-add=NET_RAW --cap-add=SYS_RAWIO \
$(docker_network_params $SUBNET 10) \
--ulimit core=-1 \
@@ -42,7 +42,7 @@
done
echo Starting container with FR testsuite
-docker run --rm \
+docker run \
--cap-add=NET_RAW --cap-add=SYS_RAWIO \
$(docker_network_params $SUBNET 103) \
--ulimit core=-1 \
@@ -63,3 +63,8 @@
# emulate running container in foreground, which is no longer possible as we
# must shift the net-devices into the container _after_ it is started
docker logs-f ${BUILD_TAG}-ttcn3-fr-test
+
+# store execution logs for both containers
+docker logs --timestamps ${BUILD_TAG}-ttcn3-fr-test >
$VOL_BASE_DIR/fr-tester/exec.log
+docker logs --timestamps ${BUILD_TAG}-frnet > $VOL_BASE_DIR/frnet/exec.log
+docker container rm ${BUILD_TAG}-frnet ${BUILD_TAG}-ttcn3-fr-test
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23373
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I60e60bfdc9f6b8fde81189d35d0ca4e73e310cc7
Gerrit-Change-Number: 23373
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in docker-playground[master]: ttcn3-fr-test: store execution logs for both containers
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23373 ) Change subject: ttcn3-fr-test: store execution logs for both containers .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I60e60bfdc9f6b8fde81189d35d0ca4e73e310cc7 Gerrit-Change-Number: 23373 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Mar 2021 15:00:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-fr-test: store execution logs for both containers
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/23373 )
Change subject: ttcn3-fr-test: store execution logs for both containers
..
ttcn3-fr-test: store execution logs for both containers
Change-Id: I60e60bfdc9f6b8fde81189d35d0ca4e73e310cc7
---
M ttcn3-fr-test/jenkins.sh
1 file changed, 7 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/73/23373/1
diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh
index 1e383e5..bfe775f 100755
--- a/ttcn3-fr-test/jenkins.sh
+++ b/ttcn3-fr-test/jenkins.sh
@@ -23,7 +23,7 @@
mkdir $VOL_BASE_DIR/unix
echo Starting container with FRNET
-docker run --rm \
+docker run \
--cap-add=NET_RAW --cap-add=SYS_RAWIO \
$(docker_network_params $SUBNET 10) \
--ulimit core=-1 \
@@ -42,7 +42,7 @@
done
echo Starting container with FR testsuite
-docker run --rm \
+docker run \
--cap-add=NET_RAW --cap-add=SYS_RAWIO \
$(docker_network_params $SUBNET 103) \
--ulimit core=-1 \
@@ -63,3 +63,8 @@
# emulate running container in foreground, which is no longer possible as we
# must shift the net-devices into the container _after_ it is started
docker logs-f ${BUILD_TAG}-ttcn3-fr-test
+
+# store execution logs for both containers
+docker logs --timestamps ${BUILD_TAG}-ttcn3-fr-test >
$VOL_BASE_DIR/fr-tester/exec.log
+docker logs --timestamps ${BUILD_TAG}-frnet > $VOL_BASE_DIR/frnet/exec.log
+docker container rm ${BUILD_TAG}-frnet ${BUILD_TAG}-ttcn3-fr-test
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23373
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I60e60bfdc9f6b8fde81189d35d0ca4e73e310cc7
Gerrit-Change-Number: 23373
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: contrib: Add build script for open5gs
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23372 )
Change subject: contrib: Add build script for open5gs
..
contrib: Add build script for open5gs
Change-Id: I0ed43dadbfe08811dd72064ee7332d0872882dfd
---
M contrib/jenkins-build-common.sh
A contrib/jenkins-build-open5gs.sh
2 files changed, 19 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, approved; Verified
diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh
index 0dac3a4..75d1e4f 100644
--- a/contrib/jenkins-build-common.sh
+++ b/contrib/jenkins-build-common.sh
@@ -151,6 +151,13 @@
rm -rf build && mkdir build && cd build || exit 1
set +x; echo; echo; set -x
cmake -DCMAKE_INSTALL_PREFIX=$prefix $configure_opts ../
+ elif [ -f meson.build ]; then
+rm -rf build && mkdir build && cd build || exit 1
+set +x; echo; echo; set -x
+meson ../ --prefix=$prefix $configure_opts
+ninja -j8
+ninja install
+return
else
echo "Unknwown build system" && exit 1
fi
diff --git a/contrib/jenkins-build-open5gs.sh b/contrib/jenkins-build-open5gs.sh
new file mode 100755
index 000..ecee8ca
--- /dev/null
+++ b/contrib/jenkins-build-open5gs.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e -x
+
+base="$PWD"
+name="open5gs"
+git_url="${git_url:-https://github.com/open5gs};
+project_name="${project_name:-open5gs}"
+. "$(dirname "$0")/jenkins-build-common.sh"
+
+build_repo $project_name "main" $configure_opts
+
+create_bin_tgz "open5gs-mmed"
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23372
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I0ed43dadbfe08811dd72064ee7332d0872882dfd
Gerrit-Change-Number: 23372
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: pespin
Gerrit-CC: Jenkins Builder
Gerrit-MessageType: merged
Change in osmo-gsm-tester[master]: contrib: Add build script for open5gs
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23372 ) Change subject: contrib: Add build script for open5gs .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I0ed43dadbfe08811dd72064ee7332d0872882dfd Gerrit-Change-Number: 23372 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 16 Mar 2021 11:51:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: contrib: Add build script for open5gs
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23372 )
Change subject: contrib: Add build script for open5gs
..
contrib: Add build script for open5gs
Change-Id: I0ed43dadbfe08811dd72064ee7332d0872882dfd
---
M contrib/jenkins-build-common.sh
A contrib/jenkins-build-open5gs.sh
2 files changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester
refs/changes/72/23372/1
diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh
index 0dac3a4..75d1e4f 100644
--- a/contrib/jenkins-build-common.sh
+++ b/contrib/jenkins-build-common.sh
@@ -151,6 +151,13 @@
rm -rf build && mkdir build && cd build || exit 1
set +x; echo; echo; set -x
cmake -DCMAKE_INSTALL_PREFIX=$prefix $configure_opts ../
+ elif [ -f meson.build ]; then
+rm -rf build && mkdir build && cd build || exit 1
+set +x; echo; echo; set -x
+meson ../ --prefix=$prefix $configure_opts
+ninja -j8
+ninja install
+return
else
echo "Unknwown build system" && exit 1
fi
diff --git a/contrib/jenkins-build-open5gs.sh b/contrib/jenkins-build-open5gs.sh
new file mode 100755
index 000..ecee8ca
--- /dev/null
+++ b/contrib/jenkins-build-open5gs.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e -x
+
+base="$PWD"
+name="open5gs"
+git_url="${git_url:-https://github.com/open5gs};
+project_name="${project_name:-open5gs}"
+. "$(dirname "$0")/jenkins-build-common.sh"
+
+build_repo $project_name "main" $configure_opts
+
+create_bin_tgz "open5gs-mmed"
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/23372
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: I0ed43dadbfe08811dd72064ee7332d0872882dfd
Gerrit-Change-Number: 23372
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in docker-playground[master]: ttcn3-fr-test: add missing TTCN3_PCAP_PATH for '-frnet' container
laforge has submitted this change. (
https://gerrit.osmocom.org/c/docker-playground/+/23371 )
Change subject: ttcn3-fr-test: add missing TTCN3_PCAP_PATH for '-frnet'
container
..
ttcn3-fr-test: add missing TTCN3_PCAP_PATH for '-frnet' container
Change-Id: Ide1b10f342f1f9d2b3bf432291218ed057f51de8
---
M ttcn3-fr-test/jenkins.sh
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved; Verified
diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh
index ee76984..1e383e5 100755
--- a/ttcn3-fr-test/jenkins.sh
+++ b/ttcn3-fr-test/jenkins.sh
@@ -27,6 +27,7 @@
--cap-add=NET_RAW --cap-add=SYS_RAWIO \
$(docker_network_params $SUBNET 10) \
--ulimit core=-1 \
+ -e "TTCN3_PCAP_PATH=/data" \
-e "WAIT_FOR_NETDEV=hdlcnet8" \
-v $VOL_BASE_DIR/frnet:/data \
--name ${BUILD_TAG}-frnet -d \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23371
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ide1b10f342f1f9d2b3bf432291218ed057f51de8
Gerrit-Change-Number: 23371
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: daniel
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in docker-playground[master]: ttcn3-fr-test: add missing TTCN3_PCAP_PATH for '-frnet' container
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23371 ) Change subject: ttcn3-fr-test: add missing TTCN3_PCAP_PATH for '-frnet' container .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ide1b10f342f1f9d2b3bf432291218ed057f51de8 Gerrit-Change-Number: 23371 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Mar 2021 10:28:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-fr-test: add missing TTCN3_PCAP_PATH for '-frnet' container
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/23371 ) Change subject: ttcn3-fr-test: add missing TTCN3_PCAP_PATH for '-frnet' container .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ide1b10f342f1f9d2b3bf432291218ed057f51de8 Gerrit-Change-Number: 23371 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: daniel Gerrit-Comment-Date: Tue, 16 Mar 2021 10:26:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-fr-test: add missing TTCN3_PCAP_PATH for '-frnet' container
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/docker-playground/+/23371 )
Change subject: ttcn3-fr-test: add missing TTCN3_PCAP_PATH for '-frnet'
container
..
ttcn3-fr-test: add missing TTCN3_PCAP_PATH for '-frnet' container
Change-Id: Ide1b10f342f1f9d2b3bf432291218ed057f51de8
---
M ttcn3-fr-test/jenkins.sh
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground
refs/changes/71/23371/1
diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh
index ee76984..1e383e5 100755
--- a/ttcn3-fr-test/jenkins.sh
+++ b/ttcn3-fr-test/jenkins.sh
@@ -27,6 +27,7 @@
--cap-add=NET_RAW --cap-add=SYS_RAWIO \
$(docker_network_params $SUBNET 10) \
--ulimit core=-1 \
+ -e "TTCN3_PCAP_PATH=/data" \
-e "WAIT_FOR_NETDEV=hdlcnet8" \
-v $VOL_BASE_DIR/frnet:/data \
--name ${BUILD_TAG}-frnet -d \
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/23371
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ide1b10f342f1f9d2b3bf432291218ed057f51de8
Gerrit-Change-Number: 23371
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: bts-trx: reorder first timerfd schedule to decrease first timeout skew
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/23368 )
Change subject: bts-trx: reorder first timerfd schedule to decrease first
timeout skew
..
bts-trx: reorder first timerfd schedule to decrease first timeout skew
By reordering the instruction, we scheduler the timerfd prior to
processing the FN on the upper layers. This means the first timerfd
expiration even will happen more inline with the expected time, that is,
CLOCK IND time + GSM_TDMA_FN_DURATION_nS.
Let T(trx_sched_fn) be the time spent executing function trx_sched_fn().
With previous order, the timerfd would have been scheduled later, which
in the end would mean expiration would happen at time CLOCK_IND +
GSM_TDMA_FN_DURATION_nS + T(trx_sched_fn), hence ending up with an extra
skew of T(trx_sched_fn) added by ourselves.
This extra skew added may be important specially at startup time (when
this code path is used), since usually the load in the system is high
and skew is usually already higher, which means helping crossing
unacceptable thresholds which may end up in osmo-bts-trx stopping with
"No clock from osmo-trx" reason.
Change-Id: Ie2ba35cd87f0bd4078ac3b4b5ec2eacad36c4258
---
M src/osmo-bts-trx/scheduler_trx.c
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
Hoernchen: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c
index 6e54d43..efd4954 100644
--- a/src/osmo-bts-trx/scheduler_trx.c
+++ b/src/osmo-bts-trx/scheduler_trx.c
@@ -369,15 +369,14 @@
static int trx_setup_clock(struct gsm_bts *bts, struct osmo_trx_clock_state
*tcs,
struct timespec *tv_now, const struct timespec *interval, uint32_t fn)
{
- tcs->last_fn_timer.fn = fn;
- /* call trx cheduler function for new 'last' FN */
- trx_sched_fn(bts, tcs->last_fn_timer.fn);
-
/* schedule first FN clock timer */
osmo_timerfd_setup(>fn_timer_ofd, trx_fn_timer_cb, bts);
osmo_timerfd_schedule(>fn_timer_ofd, NULL, interval);
+ tcs->last_fn_timer.fn = fn;
tcs->last_fn_timer.tv = *tv_now;
+ /* call trx scheduler function for new 'last' FN */
+ trx_sched_fn(bts, tcs->last_fn_timer.fn);
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23368
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Ie2ba35cd87f0bd4078ac3b4b5ec2eacad36c4258
Gerrit-Change-Number: 23368
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: bts-trx: reorder first timerfd schedule to decrease first timeout skew
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23368 ) Change subject: bts-trx: reorder first timerfd schedule to decrease first timeout skew .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie2ba35cd87f0bd4078ac3b4b5ec2eacad36c4258 Gerrit-Change-Number: 23368 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Mar 2021 10:05:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: ansible: osmocom_build_deps.yml: Install missing open5gs dep libnghtt...
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/23370 ) Change subject: ansible: osmocom_build_deps.yml: Install missing open5gs dep libnghttp2-dev .. ansible: osmocom_build_deps.yml: Install missing open5gs dep libnghttp2-dev The official Build Guide lists it as a dependency, and meson fails without it. Change-Id: I6b40acd7dd5bdc596b26227bba83e3f87a841d00 --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Verified diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 816218f..e2b5a98 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -160,6 +160,7 @@ - libmongoc-dev - libbson-dev - libyaml-dev + - libnghttp2-dev cache_valid_time: 3600 update_cache: yes when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 10 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6b40acd7dd5bdc596b26227bba83e3f87a841d00 Gerrit-Change-Number: 23370 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-ci[master]: jobs: Add OGT open5gs build jobs
pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/23369 )
Change subject: jobs: Add OGT open5gs build jobs
..
jobs: Add OGT open5gs build jobs
Change-Id: Ib7786d077017b24825d575b6801cb7c7f08ea832
---
M jobs/osmo-gsm-tester-builder.yml
M jobs/osmo-gsm-tester-runner.yml
M jobs/osmo-gsm-tester-trigger.yml
3 files changed, 8 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved; Verified
diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml
index a519f93..16f9419 100644
--- a/jobs/osmo-gsm-tester-builder.yml
+++ b/jobs/osmo-gsm-tester-builder.yml
@@ -29,6 +29,7 @@
triggered-by: master-osmo-bts
- osmo-pcu-oc2g:
triggered-by: master-osmo-pcu
+ - open5gs
- srslte
triggered-by: 'master-{repo}'
@@ -101,6 +102,8 @@
- add_param_build_branch:
name: OSMO_GSM_TESTER_BUILD_osmocom_bb
- add_param_build_branch:
+ name: OSMO_GSM_TESTER_BUILD_open5gs
+ - add_param_build_branch:
name: OSMO_GSM_TESTER_BUILD_srslte
scm:
- osmo-gsm-tester-repo
diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml
index 25d8fd0..a505629 100644
--- a/jobs/osmo-gsm-tester-runner.yml
+++ b/jobs/osmo-gsm-tester-runner.yml
@@ -87,6 +87,8 @@
- copy_artifact:
repo: osmo-gsm-tester_build-osmo-pcu-oc2g
- copy_artifact:
+ repo: osmo-gsm-tester_build-open5gs
+ - copy_artifact:
repo: osmo-gsm-tester_build-srslte
- defaults:
@@ -130,6 +132,7 @@
- osmo-gsm-tester_build-osmo-pcu-sysmo
- osmo-gsm-tester_build-osmo-bts-oc2g
- osmo-gsm-tester_build-osmo-pcu-oc2g
+- osmo-gsm-tester_build-open5gs
- osmo-gsm-tester_build-srslte
builders:
- copy_artifact_all
diff --git a/jobs/osmo-gsm-tester-trigger.yml b/jobs/osmo-gsm-tester-trigger.yml
index e37c1f1..07edcf4 100644
--- a/jobs/osmo-gsm-tester-trigger.yml
+++ b/jobs/osmo-gsm-tester-trigger.yml
@@ -28,5 +28,6 @@
osmo-gsm-tester_build-osmo-bts-sysmo,
osmo-gsm-tester_build-osmo-pcu-sysmo,
osmo-gsm-tester_build-osmo-bts-oc2g,
-osmo-gsm-tester_build-osmo-pcu-oc2g
+osmo-gsm-tester_build-osmo-pcu-oc2g,
+osmo-gsm-tester_build-open5gs,
osmo-gsm-tester_build-srslte
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/23369
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ib7786d077017b24825d575b6801cb7c7f08ea832
Gerrit-Change-Number: 23369
Gerrit-PatchSet: 2
Gerrit-Owner: pespin
Gerrit-Reviewer: laforge
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
