August 2022 - gerrit-log - lists.osmocom.org

Change in docker-playground[master]: osmo-msc-master: install libsqlite3-dev/sqlite-devel

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/29113 ) Change subject: osmo-msc-master: install libsqlite3-dev/sqlite-devel ...................................................................... osmo-msc-master: install libsqlite3-dev/sqlite-devel Since recenly, osmo-msc is using libsqlite3 directly. Change-Id: I4b0ecfcc9a25797eb8e12f07e039160dfc296d4c --- M osmo-msc-master/Dockerfile 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/13/29113/1 diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index 1ad4684..7d79988 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -9,8 +9,7 @@ apt-get update && \ apt-get install -y --no-install-recommends \ libasn1c-dev \ - libdbd-sqlite3 \ - libdbi-dev \ + libsqlite3-dev \ libosmo-abis-dev \ libosmo-mgcp-client-dev \ libosmo-gsup-client-dev \ @@ -37,6 +36,7 @@ "pkgconfig(libosmogsm)" \ "pkgconfig(libosmovty)" \ "pkgconfig(libsmpp34)" \ + sqlite-devel \ ;; \ esac -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/29113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4b0ecfcc9a25797eb8e12f07e039160dfc296d4c Gerrit-Change-Number: 29113 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ci[master]: readme, and sanitize feed name

by neels

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/29110 to look at the new patch set (#2). Change subject: readme, and sanitize feed name ...................................................................... readme, and sanitize feed name In a README, explain how to use these scripts to test a private branch. The README suggests using a private branch as feed. I am not sure whether a forward slash is allowed in a feed name, but I know that the feed name is put in a sed 's/../../' command, hence sanitize feed name. Change-Id: I4d1303e0c04e827200b48a9fe4aea3680c9c9f84 --- A scripts/obs/README M scripts/obs/lib/config.py M scripts/obs/lib/srcpkg.py 3 files changed, 122 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/10/29110/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4d1303e0c04e827200b48a9fe4aea3680c9c9f84 Gerrit-Change-Number: 29110 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 10 months

1
0
0 0

Change in osmo-upf[master]: debian: add missing changelog

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-upf/+/29111 ) Change subject: debian: add missing changelog ...................................................................... debian: add missing changelog Change-Id: I53551ce1a6d3176d480a56f8f5d2441da7346711 --- M debian/changelog 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-upf refs/changes/11/29111/1 diff --git a/debian/changelog b/debian/changelog index e69de29..ca2e0ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -0,0 +1,5 @@ +osmo-upf (0.1.0) testing; urgency=low + + Create new Debian package. + + -- Neels Hofmeyr <nhofmeyr(a)sysmocom.de> Tue, 16 Aug 2022 23:17:05 +0200 -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/29111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: I53551ce1a6d3176d480a56f8f5d2441da7346711 Gerrit-Change-Number: 29111 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ci[master]: readme, and sanitize feed name

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29110 ) Change subject: readme, and sanitize feed name ...................................................................... readme, and sanitize feed name In a README, explain how to use these scripts to test a private branch. The README suggests using a private branch as feed. I am not sure whether a forward slash is allowed in a feed name, but I know that the feed name is put in a sed 's/../../' command, hence sanitize feed name. Change-Id: I4d1303e0c04e827200b48a9fe4aea3680c9c9f84 --- A scripts/obs/README M scripts/obs/lib/config.py M scripts/obs/lib/srcpkg.py 3 files changed, 121 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/10/29110/1 diff --git a/scripts/obs/README b/scripts/obs/README new file mode 100644 index 0000000..995344a --- /dev/null +++ b/scripts/obs/README @@ -0,0 +1,115 @@ +Submitting source packages to Osmocom's OBS build server +======================================================== + +Dependencies: + + apt-get install dh-python meson osc rebar3 + +Usage Example +============= + +I want to test changes to the packaging of osmo-hnbgw. +They are committed on a private branch osmo-hnbgw.git:neels/gtpmap. +I want to test this in my OBS "Home Project" called home:nhofmeyr:test. + +Here are the steps of what I do: + +OBS home project +---------------- + +Sign up / sign in to obs.osmocom.org and create the "test" project under the +"Home Project" link (right next to the "Logout" link on the OBS web interface), +so that https://obs.osmocom.org/project/show/home:nhofmeyr:test exists. + +Make sure I can list the project using the 'osc' tool. +That requires an osc config file. +Easiest is to let osc create one and then edit it: + + $ osc list home:nhofmeyr:test + Username: nhofmeyr + Password: ************ + Select credentials manager: 4 + Server returned an error: HTTP Error 401: Unauthorized + +Now edit ~/.config/osc/oscrc and set the API URL to obs.osmocom.org: +Replace "api.opensuse.org" with "obs.osmocom.org" in two places: + + sed -i 's/api\.opensuse\.org/obs.osmocom.org/' ~/.config/osc/oscrc + +Now the 'osc list' command should no longer fail: + + $ osc list home:nhofmeyr:test + libosmo-pfcp + +Publish patches in private branch +--------------------------------- + +Push my private branch to Osmocom's git upstream -- not submit for review, just +push a private branch. + +Why is that? The obs scripts here modify the git tree, so it is better to build +the source packages on a separate git clone. + + cd ~/osmo-dev/src/osmo-hnbgw + git push --set-upstream origin neels/gtpmap + +Clone source tree into the cache +-------------------------------- + + cd ~/osmo-dev/src/osmo-ci/scripts/obs/ + ./build_srcpkg.py osmo-hnbgw + +Now there is a git clone in ./_cache/osmo-hnbgw/ + +Checkout my branch +------------------ + +#if 0 + git -C _cache/osmo-hnbgw checkout neels/gtpmap +#else +One step of update_obs_project.py is to checkout the right branch. +In order to checkout my branch, I add my branch as a feed to +./lib/config.py: + + ... + feeds = [ + "2022q1", + "2022q2", + "latest", + "nightly", + "neels/gtpmap", + ] + ... + +Now I can tell update_obs_project.py to build my branch using the -f option (see +below). +#endif + +Build and upload source package to OBS +-------------------------------------- + + ./update_obs_project.py -f neels/gtpmap home:nhofmeyr:test osmo-hnbgw + +See results +----------- + +I can now see my hnbgw package listed: + + $ osc list home:nhofmeyr:test + libosmo-pfcp + osmo-hnbgw + +I could query things via the osc tool: + + $ osc results home:nhofmeyr:test osmo-hnbgw + neels_test2 aarch64 unresolvable + neels_test2 armv7l broken + neels_test2 i586 broken + neels_test2 x86_64 unresolvable + neels_test aarch64 unresolvable + neels_test armv7l unresolvable + neels_test i586 unresolvable + neels_test x86_64 failed + +Or point my web browser at +https://obs.osmocom.org/project/show/home:nhofmeyr:test diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 997fff2..517fe48 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -32,6 +32,7 @@ "2022q2", "latest", "nightly", + "neels/gtpmap", ] # Osmocom projects: generated source packages will depend on a meta package, diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 468a240..3fce993 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -132,6 +132,11 @@ if project in lib.config.projects_osmocom: metapkg = f"osmocom-{feed}" + + # replace special chars with '_' in the feed name, + # e.g. from a user's private git branch 'johndoe/wip' + metapkg = [c for c in metapkg if c.isalnum() else '_'] + lib.debian.control_add_depend(project, metapkg, conflict_version) if has_rpm_spec: lib.rpm_spec.add_depend(project, metapkg, conflict_version) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4d1303e0c04e827200b48a9fe4aea3680c9c9f84 Gerrit-Change-Number: 29110 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 10 months

1
0
0 0

Change in osmo-ci[master]: obs: add libosmo-pfcp, osmo-upf

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29047 ) Change subject: obs: add libosmo-pfcp, osmo-upf ...................................................................... Patch Set 4: Code-Review+2 (1 comment) Patchset: PS4: combine votes -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7192f4c9e77035cebb147b8186296bcd741d419b Gerrit-Change-Number: 29047 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 16 Aug 2022 21:13:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmo-gprs[master]: tests/testsuite.at: remove $OSMO_QEMU, it's not used

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29098 ) Change subject: tests/testsuite.at: remove $OSMO_QEMU, it's not used ...................................................................... tests/testsuite.at: remove $OSMO_QEMU, it's not used Change-Id: If7332b347c0f08252b130ca7f6e7ec4fe6d78b59 --- M tests/testsuite.at 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved; Verified diff --git a/tests/testsuite.at b/tests/testsuite.at index 47a3e36..4669a00 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -5,5 +5,5 @@ AT_KEYWORDS([rlcmac]) cat $abs_srcdir/rlcmac/RLCMACTest.ok > expout cat $abs_srcdir/rlcmac/RLCMACTest.err > experr -AT_CHECK([$OSMO_QEMU $abs_top_builddir/tests/rlcmac/RLCMACTest], [0], [expout], [experr]) +AT_CHECK([$abs_top_builddir/tests/rlcmac/RLCMACTest], [0], [expout], [experr]) AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: If7332b347c0f08252b130ca7f6e7ec4fe6d78b59 Gerrit-Change-Number: 29098 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libosmo-gprs[master]: tests/rlcmac: fix incorrect RLCMACTest.{ok,err} paths in EXTRA_DIST

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29099 ) Change subject: tests/rlcmac: fix incorrect RLCMACTest.{ok,err} paths in EXTRA_DIST ...................................................................... tests/rlcmac: fix incorrect RLCMACTest.{ok,err} paths in EXTRA_DIST Change-Id: I175bd6494e2a7a6f6977388d760e790b7dd2c1ae --- M tests/rlcmac/Makefile.am 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved; Verified diff --git a/tests/rlcmac/Makefile.am b/tests/rlcmac/Makefile.am index a7193c2..633f090 100644 --- a/tests/rlcmac/Makefile.am +++ b/tests/rlcmac/Makefile.am @@ -13,8 +13,8 @@ $(NULL) EXTRA_DIST = \ - rlcmac/RLCMACTest.ok \ - rlcmac/RLCMACTest.err \ + RLCMACTest.ok \ + RLCMACTest.err \ $(NULL) RLCMACTest_SOURCES = RLCMACTest.c -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I175bd6494e2a7a6f6977388d760e790b7dd2c1ae Gerrit-Change-Number: 29099 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

Change in libosmo-gprs[master]: tests/testsuite.at: remove $OSMO_QEMU, it's not used

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29098 ) Change subject: tests/testsuite.at: remove $OSMO_QEMU, it's not used ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29098 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: If7332b347c0f08252b130ca7f6e7ec4fe6d78b59 Gerrit-Change-Number: 29098 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 16 Aug 2022 17:40:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in libosmo-gprs[master]: tests/rlcmac: fix incorrect RLCMACTest.{ok,err} paths in EXTRA_DIST

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29099 ) Change subject: tests/rlcmac: fix incorrect RLCMACTest.{ok,err} paths in EXTRA_DIST ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29099 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I175bd6494e2a7a6f6977388d760e790b7dd2c1ae Gerrit-Change-Number: 29099 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 16 Aug 2022 17:40:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-dev[master]: Add ccache.opts: CC/CXX ccache wrappers

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/29092 ) Change subject: Add ccache.opts: CC/CXX ccache wrappers ...................................................................... Add ccache.opts: CC/CXX ccache wrappers Change-Id: Ic6c5a917da688b779979959ee199b6cf8bc971a9 --- A ccache.opts 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved; Verified osmith: Looks good to me, but someone else must approve diff --git a/ccache.opts b/ccache.opts new file mode 100644 index 0000000..13dca45 --- /dev/null +++ b/ccache.opts @@ -0,0 +1 @@ +ALL CC="/usr/lib/ccache/bin/gcc" CXX="/usr/lib/ccache/bin/g++" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/29092 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ic6c5a917da688b779979959ee199b6cf8bc971a9 Gerrit-Change-Number: 29092 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022