laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27098 )
Change subject: ts_31_102: EF.PNN encoding is identical to that of DF.GSM
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/27098
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: If2ce52fccfca3d8bb2c9801b9812912922600377
Gerrit-Change-Number: 27098
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 09 Feb 2022 20:23:16 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27125 )
Change subject: publish also the HTML manual for pySim
......................................................................
publish also the HTML manual for pySim
Change-Id: I124d59626f40538da30f729beca0e40bf6b2b915
Closes: OS#5270
---
M contrib/jenkins.sh
M docs/Makefile
2 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 0fd2473..37d1d4d 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 "docs" publish
+ make -C "docs" publish publish-html
fi
# run the test with physical cards
diff --git a/docs/Makefile b/docs/Makefile
index 4e20876..e594851 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -22,6 +22,9 @@
$(BUILDDIR)/latex/pysim.pdf: latexpdf
@/bin/true
+publish-html: html
+ rsync -avz -e "ssh -o 'UserKnownHostsFile=$(OSMO_GSM_MANUALS_DIR)/build/known_hosts' -p 48" $(BUILDDIR)/html/ docs@ftp.osmocom.org:web-files/latest/pysim/
+
# put this before the catch-all below
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/27125
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I124d59626f40538da30f729beca0e40bf6b2b915
Gerrit-Change-Number: 27125
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 posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27125 )
Change subject: publish also the HTML manual for pySim
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/27125
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I124d59626f40538da30f729beca0e40bf6b2b915
Gerrit-Change-Number: 27125
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Wed, 09 Feb 2022 20:18:06 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith, laforge.
fixeria has uploaded a new patch set (#9) 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/9
--
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: 9
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
laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/27125 )
Change subject: publish also the HTML manual for pySim
......................................................................
publish also the HTML manual for pySim
Change-Id: I124d59626f40538da30f729beca0e40bf6b2b915
Closes: OS#5270
---
M contrib/jenkins.sh
M docs/Makefile
2 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/25/27125/1
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 0fd2473..37d1d4d 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 "docs" publish
+ make -C "docs" publish publish-html
fi
# run the test with physical cards
diff --git a/docs/Makefile b/docs/Makefile
index 4e20876..e594851 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -22,6 +22,9 @@
$(BUILDDIR)/latex/pysim.pdf: latexpdf
@/bin/true
+publish-html: html
+ rsync -avz -e "ssh -o 'UserKnownHostsFile=$(OSMO_GSM_MANUALS_DIR)/build/known_hosts' -p 48" $(BUILDDIR)/html/ docs@ftp.osmocom.org:web-files/latest/pysim/
+
# put this before the catch-all below
include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/27125
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I124d59626f40538da30f729beca0e40bf6b2b915
Gerrit-Change-Number: 27125
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: newchange
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 (#7).
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/7
--
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: 7
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: 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
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
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