May 2024 - gerrit-log - lists.osmocom.org

[S] Change in osmo-dev[master]: ttcn3: fix permissions before running make clean

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36764?usp=email ) Change subject: ttcn3: fix permissions before running make clean ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: as discussed with Neels, directly merging osmo-dev.git changes -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36764?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3928bea4e4743c4fa0c82ca1fe2e963a0580a68e Gerrit-Change-Number: 36764 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 12:03:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-dev[master]: src/grd: urlencode / in project names

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/36765?usp=email ) Change subject: src/grd: urlencode / in project names ...................................................................... src/grd: urlencode / in project names Fix that it didn't work with projects that contain a slash character, such as erlang/osmo-epdg. Change-Id: I810d6d0654ab8f3019c00e32762edfef7e7350a7 --- M src/grd 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/65/36765/1 diff --git a/src/grd b/src/grd index 0ca5df7..e149c6f 100755 --- a/src/grd +++ b/src/grd @@ -9,6 +9,7 @@ import os import subprocess import urllib.request +import urllib.parse def get_topdir(): @@ -37,7 +38,8 @@ def get_gerrit_details(host, project, patch_id, verbose): - url = f"https://{host}/changes/{project}~{args.patch_id}/detail" + project_q = urllib.parse.quote(project, "") + url = f"https://{host}/changes/{project_q}~{args.patch_id}/detail" print(f"Download {url}") with urllib.request.urlopen(url) as response: content = response.read().decode() -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36765?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I810d6d0654ab8f3019c00e32762edfef7e7350a7 Gerrit-Change-Number: 36765 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-dev[master]: ttcn3: fix permissions before running make clean

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/36764?usp=email ) Change subject: ttcn3: fix permissions before running make clean ...................................................................... ttcn3: fix permissions before running make clean Change-Id: I3928bea4e4743c4fa0c82ca1fe2e963a0580a68e --- M ttcn3/ttcn3.sh 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/64/36764/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index d665e84..f3d3b7c 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -28,6 +28,8 @@ "$DIR_VAR_LOCAL" if [ -d "$DIR_OSMODEV/src/osmo-ttcn3-hacks" ]; then + sudo chown -R "$(id -u):$(id -g)" \ + "$DIR_OSMODEV/src/osmo-ttcn3-hacks" make -C "$DIR_OSMODEV/src/osmo-ttcn3-hacks" clean fi -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36764?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3928bea4e4743c4fa0c82ca1fe2e963a0580a68e Gerrit-Change-Number: 36764 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-dev[master]: ttcn3.sh: prepare_local_bin: always copy scripts

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/36766?usp=email ) Change subject: ttcn3.sh: prepare_local_bin: always copy scripts ...................................................................... ttcn3.sh: prepare_local_bin: always copy scripts Always copy ttcn3-docker-run.sh from docker-playground.git, so we don't use an outdated version if the file has changed. Change-Id: I52df1da96a1848c5a4c054bb6bc9584074e9c35e --- M ttcn3/ttcn3.sh 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/66/36766/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index f3d3b7c..780a4ba 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -297,9 +297,6 @@ esac script_path_localbin="$DIR_USR_LOCAL/bin/$name_install" - if [ -x "$script_path_localbin" ]; then - continue - fi install -v -Dm755 "$script" "$script_path_localbin" done -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36766?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I52df1da96a1848c5a4c054bb6bc9584074e9c35e Gerrit-Change-Number: 36766 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-dev[master]: ttcn3.sh: bts: fix missing trxcon dependency

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/36767?usp=email ) Change subject: ttcn3.sh: bts: fix missing trxcon dependency ...................................................................... ttcn3.sh: bts: fix missing trxcon dependency Change-Id: Ia4a588842921e4382d46d3b905bba6aab3ef3359 --- M all.deps M gen_makefile.py M ttcn3/ttcn3.sh 3 files changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/67/36767/1 diff --git a/all.deps b/all.deps index 5a1191a..398ebec 100644 --- a/all.deps +++ b/all.deps @@ -48,4 +48,5 @@ # configure.ac not in topdir of repository osmocom-bb_layer23 libosmocore osmocom-bb_virtphy libosmocore +osmocom-bb_trxcon libosmocore simtrace2_host libosmocore diff --git a/gen_makefile.py b/gen_makefile.py index 3f6a994..9b896b2 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -188,6 +188,14 @@ touch $@ ''' + if proj == "osmocom-bb_trxcon": + return f''' +.make.{proj}.clone: .make.osmocom-bb.clone + @echo -e "\\n\\n\\n===== $@\\n" + test -L {src_proj} || ln -s osmocom-bb/src/host/trxcon {src_proj} + touch $@ + ''' + if proj == "simtrace2_host": return f''' .make.{proj}.clone: .make.simtrace2.clone @@ -512,6 +520,9 @@ .PHONY: virtphy virtphy: osmocom-bb_virtphy +.PHONY: trxcon +trxcon: osmocom-bb_trxcon + # # Other convenience targets # diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 780a4ba..a458f5b 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -195,7 +195,7 @@ # Osmocom bsc|bsc-*) echo "osmo-stp osmo-bsc osmo-bts-omldummy" ;; - bts) echo "osmo-bsc osmo-bts-trx" ;; + bts) echo "osmo-bsc osmo-bts-trx trxcon" ;; msc) echo "osmo-stp osmo-msc" ;; pcu-sns) echo "osmo-pcu" ;; pcu) echo "osmo-pcu osmo-bsc osmo-bts-virtual" ;; @@ -213,6 +213,7 @@ osmo-pcap-*) echo "osmo-pcap" ;; osmo-stp) echo "libosmo-sccp" ;; osmo-uecups-*) echo "osmo-uecups" ;; + trxcon) echo "osmocom-bb_trxcon" ;; *) echo "$1" ;; esac } -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36767?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia4a588842921e4382d46d3b905bba6aab3ef3359 Gerrit-Change-Number: 36767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-dev[master]: ttcn3.sh: add -c CONFIG argument

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/36768?usp=email ) Change subject: ttcn3.sh: add -c CONFIG argument ...................................................................... ttcn3.sh: add -c CONFIG argument Allow only running one of the ttcn3-bts-test configurations, instead of running all of them. Depends: docker-playground I1dce5e6aa4b5d67f9f8c96ced611ab2875c353c8 Change-Id: I46028824847ffc2d0768d32c138ccd32a6c8c769 --- M ttcn3/ttcn3.sh 1 file changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/68/36768/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index a458f5b..7cdf4c1 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -10,6 +10,7 @@ KERNEL_DIR="" KERNEL_SKIP_MARKER="$DIR_MAKE/.kernel_built_from_source" ARG_TEST_NAME="" +ARG_TEST_CONFIGS="" DOCKER_IMG_TITAN="debian-bookworm-titan" clean() { @@ -43,11 +44,14 @@ } parse_args() { - while getopts 'ht:dkf' OPTION; do + while getopts 'ht:c:dkf' OPTION; do case "$OPTION" in t) ARG_TEST_NAME="$OPTARG" ;; + c) + ARG_TEST_CONFIGS="$OPTARG" + ;; d) if [ -n "$KERNEL_TEST" ]; then echo "ERROR: use either -d or -k" @@ -81,12 +85,13 @@ ;; h|*) local name="$(basename $0)" - echo "usage: $name [-h] [-t TESTNAME] [-d|-k [-f]] PROJECT" + echo "usage: $name [-h] [-t TESTNAME] [-c CONFIG] [-d|-k [-f]] PROJECT" echo " or: $name clean" echo echo "arguments:" echo " -h show help" echo " -t only run the test with this name" + echo " -c only run test configuration with this name" echo echo "arguments for kernel tests:" echo " -d run kernel tests with debian kernel" @@ -106,6 +111,7 @@ echo " $name hss" echo " $name mme" echo " $name pgw" + echo " $name -t TC_est_dchan -c generic bts" exit 1 ;; esac @@ -482,8 +488,10 @@ if [ -n "$ARG_TEST_NAME" ]; then DOCKER_ARGS="$DOCKER_ARGS -e TEST_NAME=$ARG_TEST_NAME" fi + export DOCKER_ARGS export NO_LIST_OSMO_PACKAGES=1 + export TEST_CONFIGS="$ARG_TEST_CONFIGS" ./jenkins.sh touch "$marker" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36768?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I46028824847ffc2d0768d32c138ccd32a6c8c769 Gerrit-Change-Number: 36768 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-dev[master]: ttcn3/ttcn3.sh: collect_logs: fix tester* paths

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/36769?usp=email ) Change subject: ttcn3/ttcn3.sh: collect_logs: fix tester* paths ...................................................................... ttcn3/ttcn3.sh: collect_logs: fix tester* paths For ttcn3-bts-test and ttcn3-ggsn-test, the tester dir has the configuration at the end (…-tester-all etc.). Support that in the collect_logs function. Change-Id: I2aaab0c37fffedaeb49a362f77d795f017e2a7da --- M ttcn3/ttcn3.sh 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/69/36769/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 7cdf4c1..26f76da 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -502,11 +502,8 @@ } collect_logs() { - # Merge and move logs - cd /tmp/logs/*-tester - # Format logs - for log in *.merged; do + for log in /tmp/logs/*-tester*/*.merged; do ttcn3_logformat -o "${log}.log" "$log" sudo rm "$log" done -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36769?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I2aaab0c37fffedaeb49a362f77d795f017e2a7da Gerrit-Change-Number: 36769 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-dev[master]: no_uring_tests.opts: new file

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/36770?usp=email ) Change subject: no_uring_tests.opts: new file ...................................................................... no_uring_tests.opts: new file Change-Id: Ia1be7b4b51a1b7d21cf7053be9994ec37d58c89a --- A no_uring_tests.opts 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/70/36770/1 diff --git a/no_uring_tests.opts b/no_uring_tests.opts new file mode 100644 index 0000000..7d7a698 --- /dev/null +++ b/no_uring_tests.opts @@ -0,0 +1 @@ +libosmocore --disable-uring-tests -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36770?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ia1be7b4b51a1b7d21cf7053be9994ec37d58c89a Gerrit-Change-Number: 36770 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: tests/osmo-bts.vty: aligh with recent libosmovty changes

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36761?usp=email ) Change subject: tests/osmo-bts.vty: aligh with recent libosmovty changes ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > > What if I build an old osmo-bts with new libosmocore? […] ah yes, it's just the VTY tests. But still it should be possible to solve this in the vty test runner by making it understand [based on the text structure] what is a list of commands and then accepting any number of spaces after the command word. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36761?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I80f896e45a88550909c5767169286fc321a36e56 Gerrit-Change-Number: 36761 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 10 May 2024 11:42:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: tests/osmo-bts.vty: aligh with recent libosmovty changes

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36761?usp=email ) Change subject: tests/osmo-bts.vty: aligh with recent libosmovty changes ...................................................................... tests/osmo-bts.vty: aligh with recent libosmovty changes A new command was recently added to libosmovty: show fsm-state-graph NAME This is now the longest command, affecting spacing in the output of 'show ?' command. Align spacing to make the test pass again. Change-Id: I80f896e45a88550909c5767169286fc321a36e56 Related: libosmocore.git I09ee0a8c3fc4b1aa991ab5c93c0b654fccd7ea4c --- M tests/osmo-bts.vty 1 file changed, 33 insertions(+), 16 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/tests/osmo-bts.vty b/tests/osmo-bts.vty index 97629d0..a51ad63 100644 --- a/tests/osmo-bts.vty +++ b/tests/osmo-bts.vty @@ -19,14 +19,14 @@ OsmoBTS> show ? ... - bts Display information about a BTS - trx Display information about a TRX - timeslot Display information about a TS - lchan Display information about a logical channel - timer Show timers - e1_driver Display information about available E1 drivers - e1_line Display information about a E1 line - e1_timeslot Display information about a E1 timeslot + bts Display information about a BTS + trx Display information about a TRX + timeslot Display information about a TS + lchan Display information about a logical channel + timer Show timers + e1_driver Display information about available E1 drivers + e1_line Display information about a E1 line + e1_timeslot Display information about a E1 timeslot ... OsmoBTS> show bts ? [<0-255>] BTS Number @@ -120,14 +120,14 @@ OsmoBTS# show ? ... - bts Display information about a BTS - trx Display information about a TRX - timeslot Display information about a TS - lchan Display information about a logical channel - timer Show timers - e1_driver Display information about available E1 drivers - e1_line Display information about a E1 line - e1_timeslot Display information about a E1 timeslot + bts Display information about a BTS + trx Display information about a TRX + timeslot Display information about a TS + lchan Display information about a logical channel + timer Show timers + e1_driver Display information about available E1 drivers + e1_line Display information about a E1 line + e1_timeslot Display information about a E1 timeslot ... OsmoBTS# show bts ? [<0-255>] BTS Number -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36761?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I80f896e45a88550909c5767169286fc321a36e56 Gerrit-Change-Number: 36761 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2024