- gerrit-log - lists.osmocom.org

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files
by fixeria 10 Feb '22

10 Feb '22

Attention is currently required from: osmith, laforge. fixeria has uploaded a new patch set (#8) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... ttcn3-bts-test: use osmo-config-merge to generate config files This uses the config files from osmo-ttcn3-hacks.git instead of keeping local copies around here, which has shown many times will get out of sync. Download the original files using wget (*.src.cfg) and merge them with the local *.confmerge files using osmo-config-merge (*.gen.cfg). Unfortunately, osmo-config-merge is not capable of removing text blocks or substituting specific parts, so we fall-back to using sed where it's needed. A good example is 'log gsmtap 127.0.0.1', as there is no command for removing a logging target of such type. Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 --- M .gitignore M ttcn3-bts-test/Makefile D ttcn3-bts-test/fh/osmo-bsc.cfg A ttcn3-bts-test/fh/osmo-bsc.confmerge M ttcn3-bts-test/jenkins.sh D ttcn3-bts-test/oml/osmo-bts.cfg A ttcn3-bts-test/oml/osmo-bts.confmerge D ttcn3-bts-test/osmo-bsc.cfg A ttcn3-bts-test/osmo-bsc.confmerge D ttcn3-bts-test/osmo-bts.cfg A ttcn3-bts-test/osmo-bts.confmerge D ttcn3-bts-test/virtphy/osmo-bts.cfg A ttcn3-bts-test/virtphy/osmo-bts.confmerge 13 files changed, 322 insertions(+), 853 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/22/20622/8 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 8 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

Change in osmo-ci[master]: jobs/master-builds.yml: Add master-pysim to publish manual
by laforge 10 Feb '22

10 Feb '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27121 ) Change subject: jobs/master-builds.yml: Add master-pysim to publish manual ...................................................................... jobs/master-builds.yml: Add master-pysim to publish manual We only had gerrit build verification for pysim so far, but no 'master' job that periodically builds/tests master (and publishes the manual). As a reult, the pySim manual was still the original version from April 2021, while the code has of course progressed quite a bit in git since. Change-Id: I4dce05cdb5f2c574256378d5fb66cff1c329c141 Closes: OS#5271 --- M jobs/master-builds.yml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 0b226d1..95efdd6 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -371,6 +371,11 @@ - rtl-sdr: email: laforge(a)gnumonks.org steve(a)steve-m.de + - pysim: + concurrent: false + slave_axis: !!python/tuple [simtester] + cmd: 'PUBLISH=1 WITH_MANUALS=1 /usr/bin/timeout 30m ./contrib/jenkins.sh' + - sysmo-usim-tool: concurrent: false cmd: cd ./tests; ./run-tests -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4dce05cdb5f2c574256378d5fb66cff1c329c141 Gerrit-Change-Number: 27121 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: jobs/master-builds.yml: Add master-pysim to publish manual
by laforge 10 Feb '22

10 Feb '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27121 ) Change subject: jobs/master-builds.yml: Add master-pysim to publish manual ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27121 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4dce05cdb5f2c574256378d5fb66cff1c329c141 Gerrit-Change-Number: 27121 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 09 Feb 2022 19:37:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files
by fixeria 10 Feb '22

10 Feb '22

Attention is currently required from: osmith, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 7: (1 comment) File ttcn3-bts-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/20622/comment/7c52cd55_deb… PS6, Line 139: cp osmo-bsc-generic.gen.cfg $VOL_BASE_DIR/bsc/ > Thanks. Looks like I forgot to run tests after I made this change. Wait, actually no. I did change the start_{bsc,bts} functions, so they expect the config files to match '*.gen.cfg' pattern. I am reverting this change. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 09 Feb 2022 19:33:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files
by fixeria 10 Feb '22

10 Feb '22

Attention is currently required from: osmith, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 7: (1 comment) Patchset: PS6: > > However, I am not sure if there is an easy & beautiful solution. […] Thanks! Your proposal challenged me, so I wanted to see if it's possible to do the same keeping the Makefile rules. Looks like yes ;) Does the new patchest look better to you? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 09 Feb 2022 19:28:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files
by fixeria 10 Feb '22

10 Feb '22

Attention is currently required from: osmith, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 6: (1 comment) File ttcn3-bts-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/20622/comment/b73666db_a25… PS6, Line 139: cp osmo-bsc-generic.gen.cfg $VOL_BASE_DIR/bsc/ > Needs to be: […] Thanks. Looks like I forgot to run tests after I made this change. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 09 Feb 2022 19:19:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in docker-playground[master]: ttcn3-bts-test: move generic config files into a directory
by fixeria 10 Feb '22

10 Feb '22

Hello laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/26681 to look at the new patch set (#6). Change subject: ttcn3-bts-test: move generic config files into a directory ...................................................................... ttcn3-bts-test: move generic config files into a directory Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 --- M ttcn3-bts-test/Dockerfile M ttcn3-bts-test/Makefile R ttcn3-bts-test/generic/BTS_Tests.cfg R ttcn3-bts-test/generic/osmo-bsc.confmerge R ttcn3-bts-test/generic/osmo-bts.confmerge M ttcn3-bts-test/jenkins.sh 6 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/81/26681/6 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1bc5c51306525c6829e9d8e2991555a99c9b49a2 Gerrit-Change-Number: 26681 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files
by fixeria 10 Feb '22

10 Feb '22

Attention is currently required from: laforge, fixeria. fixeria has uploaded a new patch set (#7) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/docker-playground/+/20622 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... ttcn3-bts-test: use osmo-config-merge to generate config files This uses the config files from osmo-ttcn3-hacks.git instead of keeping local copies around here, which has shown many times will get out of sync. Download the original files using wget (*.src.cfg) and merge them with the local *.confmerge files using osmo-config-merge (*.gen.cfg). Unfortunately, osmo-config-merge is not capable of removing text blocks or substituting specific parts, so we fall-back to using sed where it's needed. A good example is 'log gsmtap 127.0.0.1', as there is no command for removing a logging target of such type. Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 --- M .gitignore M ttcn3-bts-test/Makefile D ttcn3-bts-test/fh/osmo-bsc.cfg A ttcn3-bts-test/fh/osmo-bsc.confmerge M ttcn3-bts-test/jenkins.sh D ttcn3-bts-test/oml/osmo-bts.cfg A ttcn3-bts-test/oml/osmo-bts.confmerge D ttcn3-bts-test/osmo-bsc.cfg A ttcn3-bts-test/osmo-bsc.confmerge D ttcn3-bts-test/osmo-bts.cfg A ttcn3-bts-test/osmo-bts.confmerge D ttcn3-bts-test/virtphy/osmo-bts.cfg A ttcn3-bts-test/virtphy/osmo-bts.confmerge 13 files changed, 322 insertions(+), 853 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/22/20622/7 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/20622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If15461240f3037c142c176fc7da745a1701ae3f8 Gerrit-Change-Number: 20622 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Assignee: fixeria <vyanitskiy(a)sysmocom.de> 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-ttcn3-hacks[master]: Makefile: run $(nproc) parallel jobs for target 'deps'
by fixeria 10 Feb '22

10 Feb '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27124 ) Change subject: Makefile: run $(nproc) parallel jobs for target 'deps' ...................................................................... Makefile: run $(nproc) parallel jobs for target 'deps' Change-Id: I53112a20d78d12bcc2764c1fc5567eb26bfa46cc --- M Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/27124/1 diff --git a/Makefile b/Makefile index 87ce759..91c826c 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ .PHONY: deps deps: - $(MAKE) -C deps + $(MAKE) $(PARALLEL_MAKE) -C deps # deps-update target for backwards compat; now does the same as 'make deps' .PHONY: deps-update -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27124 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I53112a20d78d12bcc2764c1fc5567eb26bfa46cc Gerrit-Change-Number: 27124 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in docker-playground[master]: ttcn3-bts-test: use osmo-config-merge to generate config files
by fixeria 10 Feb '22

10 Feb '22

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27103 ) Change subject: ttcn3-bts-test: use osmo-config-merge to generate config files ...................................................................... Patch Set 3: Code-Review+1 (1 comment) Patchset: PS3: Looks good to me, thanks for moving this forward! -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If2d1ba8a775dc6c396f50f9853e633df110329a9 Gerrit-Change-Number: 27103 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Feb 2022 18:03:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log