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

[M] Change in osmo-ci[master]: obs: don't pass proj through functions
by laforge 15 Mar '23

15 Mar '23

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31927 ) Change subject: obs: don't pass proj through functions ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id213ae155f34c74529845ff86468b68ffa6ffb1d Gerrit-Change-Number: 31927 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: Wed, 15 Mar 2023 18:05:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: obs: lib.args: store argparse result here
by laforge 15 Mar '23

15 Mar '23

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31926 ) Change subject: obs: lib.args: store argparse result here ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I48853444f1386dfb842c174ebc45f9decc8bec0f Gerrit-Change-Number: 31926 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: Wed, 15 Mar 2023 18:05:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-gsm-manuals[master]: Fix mistypes
by laforge 15 Mar '23

15 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31925 ) Change subject: Fix mistypes ...................................................................... Fix mistypes Change-Id: I87da6bec137c7be37ec748ec1f9f8d072517022d --- M common/chapters/cell-broadcast.adoc M common/chapters/preface.adoc M common/chapters/sigtran-osmocom.adoc M common/chapters/sigtran.adoc 4 files changed, 19 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/common/chapters/cell-broadcast.adoc b/common/chapters/cell-broadcast.adoc index a87efae..842e8d1 100644 --- a/common/chapters/cell-broadcast.adoc +++ b/common/chapters/cell-broadcast.adoc @@ -18,7 +18,7 @@ === Use Cases Cell Broadcast was used for various different use cases primarily in -the 1990ies and early 2000s, including +the 1990s and early 2000s, including * advertisement of the GPS position of the cell tower you're currently camping on * advertisement of the calling codes of your current "home zone", i.e. a diff --git a/common/chapters/preface.adoc b/common/chapters/preface.adoc index 76e6f48..b8f7e72 100644 --- a/common/chapters/preface.adoc +++ b/common/chapters/preface.adoc @@ -1,7 +1,7 @@ == Foreword Digital cellular networks based on the GSM specification were designed -in the late 1980ies and first deployed in the early 1990ies in Europe. +in the late 1980s and first deployed in the early 1990s in Europe. Over the last 25 years, hundreds of networks were established globally and billions of subscribers have joined the associated networks. diff --git a/common/chapters/sigtran-osmocom.adoc b/common/chapters/sigtran-osmocom.adoc index fa8e128..05cdedb 100644 --- a/common/chapters/sigtran-osmocom.adoc +++ b/common/chapters/sigtran-osmocom.adoc @@ -38,7 +38,7 @@ ==== The present (2017) In 2017, sysmocom was tasked with implementing a 3GPP AoIP compliant A -interface. This meant that lot of things had to change in the +interface. This meant that a lot of things had to change in the existing code: * removal of the existing hard-wired SCCPlite/IPA code from OsmoBSC @@ -112,7 +112,7 @@ `accept-asp-connections dynamic-permitted`. To enable dynamic registration of routing keys via RKM, the -corresponding SS7 Instance (<<ss7-instance>>) must be confgured with +corresponding SS7 Instance (<<ss7-instance>>) must be configured with `xua rkm routing-key-allocation dynamic-permitted`. This is of course highly insecure and can only be used in trusted, @@ -349,7 +349,7 @@ |Recovery Timeout|Duration of the AS T(r) recovery timer. During this time, outgoing messages are queued. If the AS is ACTIVE before timer expiration, the queue is drained. At - expriation, the queue is flushed. + expiration, the queue is flushed. |State|Application Server State (Down, Inactive, Active, Pending) |ASPs|Which ASPs are permitted to transfer traffic for this AS |==== @@ -360,7 +360,7 @@ connection. From the STP/SG (Server) point-of-view, those are incoming connections from Application Servers such as the BSCs. From the ASP (Client) Point of view, it has one `osmo_ss7_asp` object for -each outbound SIGTARN connection. +each outbound SIGTRAN connection. An ASP has the following properties: diff --git a/common/chapters/sigtran.adoc b/common/chapters/sigtran.adoc index 2cbd84c..51ef65e 100644 --- a/common/chapters/sigtran.adoc +++ b/common/chapters/sigtran.adoc @@ -33,7 +33,7 @@ === Message Transfer Part (MTP) MTP is the lower layer of the SS7 protocol stack. It is comprised of -two sub-layes, called MTP2 and MTP3. +two sub-layers, called MTP2 and MTP3. Nodes in a MTP network are addressed by their unique PC (Point Code). @@ -54,7 +54,7 @@ ==== Point Codes The length of point codes depends on the particular MTP dialect that -is used. In the 1980ies, when international telephony signaling +is used. In the 1980s, when international telephony signaling networks were established, most countries had their own national dialects with certain specifics. @@ -210,7 +210,7 @@ SS7 backbone by means as SUA and M3UA. Over time, even the links of the actual network backbone networks became more and more IP based. -In order to replace existing TDM-based SS7 links/liksets with SIGTRAN, +In order to replace existing TDM-based SS7 links/linksets with SIGTRAN, the M2UA or M2PA variants are used as a kind of drop-in replacement for physical links. @@ -334,7 +334,7 @@ underlying IP transport is transparent to the SS7/SCCP applications, there is no restriction on whether to use SIGTRAN over IPv4 or IPv6. -==== SCTP multi-homing in SIGTARN +==== SCTP multi-homing in SIGTRAN SCTP, unlike more traditional IP L4 protocols (TCP, UDP) doesn't work based on a _connection_ between source IP:port and Destination IP:port. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31925 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: I87da6bec137c7be37ec748ec1f9f8d072517022d Gerrit-Change-Number: 31925 Gerrit-PatchSet: 1 Gerrit-Owner: vp <vilius(a)elitnet.lt> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-gsm-manuals[master]: Fix mistypes
by laforge 15 Mar '23

15 Mar '23

Attention is currently required from: vp. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31925 ) Change subject: Fix mistypes ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Thanks for going the extra mile to not only report, but even submit a patch to our gerrit! -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31925 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: I87da6bec137c7be37ec748ec1f9f8d072517022d Gerrit-Change-Number: 31925 Gerrit-PatchSet: 1 Gerrit-Owner: vp <vilius(a)elitnet.lt> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: vp <vilius(a)elitnet.lt> Gerrit-Comment-Date: Wed, 15 Mar 2023 18:04:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-gsm-manuals[master]: Fix mistypes
by pespin 15 Mar '23

15 Mar '23

Attention is currently required from: vp. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31925 ) Change subject: Fix mistypes ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/31925 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: I87da6bec137c7be37ec748ec1f9f8d072517022d Gerrit-Change-Number: 31925 Gerrit-PatchSet: 1 Gerrit-Owner: vp <vilius(a)elitnet.lt> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: vp <vilius(a)elitnet.lt> Gerrit-Comment-Date: Wed, 15 Mar 2023 18:04:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: obs: don't pass meta through functions
by osmith 15 Mar '23

15 Mar '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/31932 ) Change subject: obs: don't pass meta through functions ...................................................................... obs: don't pass meta through functions Change-Id: Ieb49e5f8630e3e918b11a7a225febbbcee2e82b3 --- M scripts/obs/update_obs_project.py 1 file changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/32/31932/1 diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 93f2f7c..867198d 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -112,12 +112,12 @@ lib.osc.update_package(package, version) -def build_srcpkgs(pkgs_remote, packages, meta, skip_up_to_date): +def build_srcpkgs(pkgs_remote, packages, skip_up_to_date): print() print("### Building source packages ###") print() - if meta: + if lib.args.meta: feed = lib.args.feed build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}", True, skip_up_to_date) @@ -214,7 +214,7 @@ pkgs_remote = lib.osc.get_remote_pkgs() - build_srcpkgs(pkgs_remote, packages, args.meta, args.skip_up_to_date) + build_srcpkgs(pkgs_remote, packages, args.skip_up_to_date) upload_srcpkgs(pkgs_remote) exit_with_summary() -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ieb49e5f8630e3e918b11a7a225febbbcee2e82b3 Gerrit-Change-Number: 31932 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: obs: add --allow-unknown-package
by osmith 15 Mar '23

15 Mar '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/31935 ) Change subject: obs: add --allow-unknown-package ...................................................................... obs: add --allow-unknown-package Prepare to add a wireshark package. It will be in its own osmocom:wireshark repository, and not in osmocom:nightly, :latest, :master, so it's not added to lib/config.py. Move lib.set_args() before parse_packages(), so the latter is able to use lib.args.allow_unknown_package. Related: OS#2537 Change-Id: I007f937ccb629e0593ec9253541ed05df42fac66 --- M scripts/obs/lib/__init__.py M scripts/obs/update_obs_project.py 2 files changed, 24 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/35/31935/1 diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 675bcec..964b298 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -27,6 +27,9 @@ " other feeds build their respective branch.", metavar="FEED", default="nightly", choices=lib.config.feeds) + parser.add_argument("-a", "--allow-unknown-package", action="store_true", + help="don't complain if the name of the package is not" + " stored in lib/config.py") parser.add_argument("-b", "--git-branch", help="instead of using a branch" " based on the feed, checkout this git branch", metavar="BRANCH", default=None) @@ -102,6 +105,9 @@ if os.path.basename(package_cfg) == package: return package_cfg + if lib.args.allow_unknown_package: + return package + print(f"ERROR: unknown package: {package}") print("See packages_osmocom and packages_other in obs/lib/config.py") exit(1) diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 24dba8f..da796ad 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -194,9 +194,8 @@ help="package name, e.g. libosmocore or open5gs," " default is all packages") args = parser.parse_args() - packages = parse_packages(args.package) - lib.set_args(args) + packages = parse_packages(args.package) if args.docker: lib.docker.run_in_docker_and_exit("update_obs_project.py", True) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I007f937ccb629e0593ec9253541ed05df42fac66 Gerrit-Change-Number: 31935 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: obs: add --git-skip-checkout argument
by osmith 15 Mar '23

15 Mar '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/31934 ) Change subject: obs: add --git-skip-checkout argument ...................................................................... obs: add --git-skip-checkout argument Prepare to use this for wireshark, to build a branch on-the-fly that does not get pushed to origin, with Osmocom patches on top of upstream master. Related: OS#2537 Change-Id: Ifc963daf51ba3542f67420daaf7b29745404a92e --- M scripts/obs/lib/__init__.py M scripts/obs/lib/git.py 2 files changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/34/31934/1 diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index edf19f4..675bcec 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -36,6 +36,9 @@ parser.add_argument("-s", "--git-skip-fetch", help="do not fetch already cloned git repositories", action="store_false", dest="git_fetch") + parser.add_argument("-S", "--git-skip-checkout", + help="do not checkout and reset to a branch/tag", + action="store_false", dest="git_checkout") parser.add_argument("-m", "--meta", action="store_true", help="build a meta package (e.g. osmocom-nightly)") parser.add_argument("-i", "--ignore-req", action="store_true", diff --git a/scripts/obs/lib/git.py b/scripts/obs/lib/git.py index f1ee98d..15cb276 100644 --- a/scripts/obs/lib/git.py +++ b/scripts/obs/lib/git.py @@ -53,6 +53,11 @@ def checkout(project, branch): repo_path = get_repo_path(project) + if not lib.args.git_checkout: + ref = lib.run_cmd(["git", "log", "--pretty=oneline", "--abbrev-commit", + "-1"], cwd=repo_path).output.rstrip() + print(f"{project}: skipping git checkout, current commit: {ref}") + return print(f"{project}: 'git checkout -f {branch}'") lib.run_cmd(["git", "checkout", "-f", branch], cwd=repo_path) print(f"{project}: 'git reset --hard {branch}'") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifc963daf51ba3542f67420daaf7b29745404a92e Gerrit-Change-Number: 31934 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: obs: don't pass skip_up_to_date through functions
by osmith 15 Mar '23

15 Mar '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/31933 ) Change subject: obs: don't pass skip_up_to_date through functions ...................................................................... obs: don't pass skip_up_to_date through functions Change-Id: Ide0c1f5452f5ce965541b45039345abc52b3d140 --- M scripts/obs/update_obs_project.py 1 file changed, 15 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/33/31933/1 diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index 867198d..24dba8f 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -62,7 +62,7 @@ return False -def build_srcpkg_if_needed(pkgs_remote, package, is_meta_pkg, skip_up_to_date): +def build_srcpkg_if_needed(pkgs_remote, package, is_meta_pkg): global srcpkgs_skipped feed = lib.args.feed branch = lib.args.git_branch @@ -89,7 +89,7 @@ else: obs_version = lib.osc.get_package_version(package) if is_up_to_date(obs_version, latest_version): - if skip_up_to_date: + if lib.args.skip_up_to_date: print(f"{package}: skipping ({obs_version} is up-to-date)") srcpkgs_skipped += [package] return @@ -112,19 +112,17 @@ lib.osc.update_package(package, version) -def build_srcpkgs(pkgs_remote, packages, skip_up_to_date): +def build_srcpkgs(pkgs_remote, packages): print() print("### Building source packages ###") print() if lib.args.meta: feed = lib.args.feed - build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}", - True, skip_up_to_date) + build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}", True) for package in packages: - build_srcpkg_if_needed(pkgs_remote, package, - False, skip_up_to_date) + build_srcpkg_if_needed(pkgs_remote, package, False) def upload_srcpkgs(pkgs_remote): @@ -214,7 +212,7 @@ pkgs_remote = lib.osc.get_remote_pkgs() - build_srcpkgs(pkgs_remote, packages, args.skip_up_to_date) + build_srcpkgs(pkgs_remote, packages) upload_srcpkgs(pkgs_remote) exit_with_summary() -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ide0c1f5452f5ce965541b45039345abc52b3d140 Gerrit-Change-Number: 31933 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: obs: add --version-append argument
by osmith 15 Mar '23

15 Mar '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/31936 ) Change subject: obs: add --version-append argument ...................................................................... obs: add --version-append argument Related: OS#2537 Change-Id: Iff5a530bebd645be13e0206ce0a670e1dfe6e2f9 --- M scripts/obs/lib/__init__.py M scripts/obs/lib/srcpkg.py 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/36/31936/1 diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 964b298..9682b19 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -63,6 +63,10 @@ parser.add_argument("-v", "--verbose", action="store_true", help="always print shell commands and their output," " instead of only printing them on error") + parser.add_argument("-e", "--version-append", + help="add a string at the end of the version, e.g." + " '~osmocom' for the wireshark package to" + " indicate that it is the version from our repo") def set_cmds_verbose(new_val): diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index b230353..2e602c1 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -135,15 +135,21 @@ def build(project, gerrit_id=0): feed = lib.args.feed + version_append = lib.args.version_append + lib.git.clone(project) lib.git.clean(project) if gerrit_id > 0: lib.git.checkout_from_review(project, gerrit_id) else: checkout_for_feed(project) + version = get_version_for_feed(project) + if version_append: + version += version_append epoch = get_epoch(project) version_epoch = f"{epoch}:{version}" if epoch else version + has_rpm_spec = lib.rpm_spec.get_spec_in_path(project) is not None print(f"{project}: building source package {version_epoch}") -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iff5a530bebd645be13e0206ce0a670e1dfe6e2f9 Gerrit-Change-Number: 31936 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0