March 2023 - gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: docs/Makefile: don't forward shrink to sphinx
by laforge 20 Mar '23

20 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/31985 ) Change subject: docs/Makefile: don't forward shrink to sphinx ...................................................................... docs/Makefile: don't forward shrink to sphinx Adjust the catch-all target at the end of the Makefile that is supposed to route all unknown targets to sphinx, so it doesn't do this for the shrink target. The shrink target has recently been added to Makefile.common.inc in osmo-gsm-manuals, which gets included right above the catch-all target. So it isn't an unknown target, but for some reason the sphinx catch-all runs in addition to the shrink target (runs shrink-pdfs.sh, see output below) and fails. As I did not add the catch-all logic, preserve it but add an exception for the shrink rule. Fix for: + make -C docs publish publish-html make: Entering directory '/build/docs' /opt/osmo-gsm-manuals/build/shrink-pdfs.sh _build/latex/osmopysim-usermanual.pdf * _build/latex/osmopysim-usermanual.pdf: 272K (shrunk from 336K) Running Sphinx v5.3.0 Sphinx error: Builder name shrink not registered or available through entry point Related: SYS#6380 Change-Id: If2802bb93909aba90debe5e03f3047cec73e2f54 --- M docs/Makefile 1 file changed, 32 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/docs/Makefile b/docs/Makefile index 6effe53..3b99b25 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -47,4 +47,6 @@ # Catch-all target: route all unknown targets to Sphinx using the new # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). %: - @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + @if [ "$@" != "shrink" ]; then \ + $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O); \ + fi -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If2802bb93909aba90debe5e03f3047cec73e2f54 Gerrit-Change-Number: 31985 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: gitignore: add manuals related files
by laforge 20 Mar '23

20 Mar '23

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/31986 ) Change subject: gitignore: add manuals related files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I93a63b33032f93f381b8ef451aecc97d3011ce8c Gerrit-Change-Number: 31986 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 20 Mar 2023 12:49:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: docs/Makefile: don't forward shrink to sphinx
by laforge 20 Mar '23

20 Mar '23

Attention is currently required from: osmith, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/31985 ) Change subject: docs/Makefile: don't forward shrink to sphinx ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If2802bb93909aba90debe5e03f3047cec73e2f54 Gerrit-Change-Number: 31985 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 20 Mar 2023 12:49:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: gitignore: add manuals related files
by osmith 20 Mar '23

20 Mar '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/31986 ) Change subject: gitignore: add manuals related files ...................................................................... gitignore: add manuals related files Change-Id: I93a63b33032f93f381b8ef451aecc97d3011ce8c --- M .gitignore 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/86/31986/1 diff --git a/.gitignore b/.gitignore index d18402d..8401eb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ *.pyc .*.swp + +/docs/_* +/docs/generated -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I93a63b33032f93f381b8ef451aecc97d3011ce8c Gerrit-Change-Number: 31986 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in pysim[master]: docs/Makefile: don't forward shrink to sphinx
by osmith 20 Mar '23

20 Mar '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/31985 ) Change subject: docs/Makefile: don't forward shrink to sphinx ...................................................................... docs/Makefile: don't forward shrink to sphinx Adjust the catch-all target at the end of the Makefile that is supposed to route all unknown targets to sphinx, so it doesn't do this for the shrink target. The shrink target has recently been added to Makefile.common.inc in osmo-gsm-manuals, which gets included right above the catch-all target. So it isn't an unknown target, but for some reason the sphinx catch-all runs in addition to the shrink target (runs shrink-pdfs.sh, see output below) and fails. As I did not add the catch-all logic, preserve it but add an exception for the shrink rule. Fix for: + make -C docs publish publish-html make: Entering directory '/build/docs' /opt/osmo-gsm-manuals/build/shrink-pdfs.sh _build/latex/osmopysim-usermanual.pdf * _build/latex/osmopysim-usermanual.pdf: 272K (shrunk from 336K) Running Sphinx v5.3.0 Sphinx error: Builder name shrink not registered or available through entry point Related: SYS#6380 Change-Id: If2802bb93909aba90debe5e03f3047cec73e2f54 --- M docs/Makefile 1 file changed, 32 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/85/31985/1 diff --git a/docs/Makefile b/docs/Makefile index 6effe53..3b99b25 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -47,4 +47,6 @@ # Catch-all target: route all unknown targets to Sphinx using the new # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). %: - @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + @if [ "$@" != "shrink" ]; then \ + $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O); \ + fi -- To view, visit https://gerrit.osmocom.org/c/pysim/+/31985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If2802bb93909aba90debe5e03f3047cec73e2f54 Gerrit-Change-Number: 31985 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: jobs: master-osmo-e1-hardware: fix manuals
by osmith 20 Mar '23

20 Mar '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31981 ) Change subject: jobs: master-osmo-e1-hardware: fix manuals ...................................................................... jobs: master-osmo-e1-hardware: fix manuals Build the manuals with the regular docker image, instead of the fpga-build one. Fix for: build/shrink-pdfs.sh: 8: build/shrink-pdfs.sh: ps2pdf: not found Related: SYS#6380 Change-Id: I6e9f832dc449af0ca7def29ef5a9161285b01736 --- M jobs/master-builds.yml 1 file changed, 17 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 9e0aa1b..008452a 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -272,7 +272,7 @@ cmd: | DOCKER_IMG="{docker_img}" case "$JOB_TYPE" in - firmware|gateware|manuals) + firmware|gateware) DOCKER_IMG="registry.osmocom.org/$USER/fpga-build" docker pull "$DOCKER_IMG" ;; -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6e9f832dc449af0ca7def29ef5a9161285b01736 Gerrit-Change-Number: 31981 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-gsm-manuals[master]: build/Makefile.common: full path for shrink script
by osmith 20 Mar '23

20 Mar '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31983 ) Change subject: build/Makefile.common: full path for shrink script ...................................................................... build/Makefile.common: full path for shrink script Use the full path to shrink-pdfs.sh, so it works as expected when the symlinks are not present. This is how pysim uses the publish/shrink targets. Fix for: build/shrink-pdfs.sh _build/latex/osmopysim-usermanual.pdf make: build/shrink-pdfs.sh: Command not found Related: SYS#6380 Change-Id: Iba6e0e4932741adcb9e54e54eb7774716fb2e244 --- M build/Makefile.common.inc 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/build/Makefile.common.inc b/build/Makefile.common.inc index 9e79621..80f2c19 100644 --- a/build/Makefile.common.inc +++ b/build/Makefile.common.inc @@ -24,7 +24,7 @@ # Reduce pdf size by storing the embedded images with less quality (SYS#6380) shrink: $(SHRINK_MARKER) $(SHRINK_MARKER): $(UPLOAD_FILES) - build/shrink-pdfs.sh $(UPLOAD_FILES) + $(OSMO_GSM_MANUALS_DIR)/build/shrink-pdfs.sh $(UPLOAD_FILES) # Publish to $UPLOAD_PATH upload: shrink -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Iba6e0e4932741adcb9e54e54eb7774716fb2e244 Gerrit-Change-Number: 31983 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-gsm-manuals[master]: build/Makefile.common: full path for shrink script
by osmith 20 Mar '23

20 Mar '23

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31983 ) Change subject: build/Makefile.common: full path for shrink script ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Iba6e0e4932741adcb9e54e54eb7774716fb2e244 Gerrit-Change-Number: 31983 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 20 Mar 2023 11:04:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: README: add example: nightlies from different date
by osmith 20 Mar '23

20 Mar '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/31984 ) Change subject: README: add example: nightlies from different date ...................................................................... README: add example: nightlies from different date Change-Id: I1b21c90b13a11aa1e51ea337207775c729709676 --- M README.md 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/84/31984/1 diff --git a/README.md b/README.md index dd3d992..0e59fe3 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,16 @@ * `NO_DOCKER_IMAGE_BUILD`: when set to `1`, it won't try to update the containers (see "caching" below) +### Using nightly packages from a different date + +Pick a date from [here](https://downloads.osmocom.org/obs-mirror/) and use it: + +``` +$ export OSMOCOM_REPO_PATH="obs-mirror/20230316-061901" +$ cd ttcn3-bsc-test +$ ./jenkins.sh +``` + ### More examples latest (debian): -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/31984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1b21c90b13a11aa1e51ea337207775c729709676 Gerrit-Change-Number: 31984 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: jobs: master-osmo-e1-hardware: fix manuals
by fixeria 20 Mar '23

20 Mar '23

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31981 ) Change subject: jobs: master-osmo-e1-hardware: fix manuals ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6e9f832dc449af0ca7def29ef5a9161285b01736 Gerrit-Change-Number: 31981 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 20 Mar 2023 10:47:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0