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
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
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
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
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
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27122 )
Change subject: contrib/jenkins.sh: first upload manuals, then execute physical tests
......................................................................
contrib/jenkins.sh: first upload manuals, then execute physical tests
The tests with physical cards should not prevent upload of the manuals
Change-Id: I8aecb4ce211cbcc3890886ef24b04d01c510b6da
---
M contrib/jenkins.sh
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index a01c012..480f3e5 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -47,10 +47,10 @@
pip3 install -e 'git+https://github.com/osmocom/sphinx-argparse@master#egg=sphinx-argparse'
(cd docs && make html latexpdf)
-# run the test with physical cards
-cd pysim-testdata
-../tests/pysim-test.sh
-
if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
make -C "$base/docs" publish
fi
+
+# run the test with physical cards
+cd pysim-testdata
+../tests/pysim-test.sh
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/27122
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I8aecb4ce211cbcc3890886ef24b04d01c510b6da
Gerrit-Change-Number: 27122
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27123 )
Change subject: contrib/jenkins.sh: Fix PUBLISH
......................................................................
contrib/jenkins.sh: Fix PUBLISH
There is no $base in this script, and the current form renders:
make: *** /docs: No such file or directory. Stop.
Build step 'Execute shell' marked build as failure
Change-Id: Ifcf27f7497daeb285dfb364bff20d0c861c77dcb
Related: OS#5271
---
M contrib/jenkins.sh
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 480f3e5..0fd2473 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -48,7 +48,7 @@
(cd docs && make html latexpdf)
if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
- make -C "$base/docs" publish
+ make -C "docs" publish
fi
# run the test with physical cards
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/27123
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ifcf27f7497daeb285dfb364bff20d0c861c77dcb
Gerrit-Change-Number: 27123
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
Attention is currently required from: laforge, lynxis lazus.
Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26995 )
Change subject: cardem: set more reasonable interrupt priorities
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
I'd prefer a less scatted approach to setting the priorities, since anyone ever cares about are the relative values, so setting all in one place allows figuring that out without having to grep the code and tracking down control flow.
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26995
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: Ie6c97d61d8da3990b6e44144f36cb6d37d194307
Gerrit-Change-Number: 26995
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Wed, 09 Feb 2022 17:21:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment