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

[M] Change in docker-playground[master]: ttcn3-hnbgw: Update config files for latest after osmo-hnbgw new release

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34399?usp=email ) Change subject: ttcn3-hnbgw: Update config files for latest after osmo-hnbgw new release ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34399?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id184686ba50ec07532b2f11cc9513626f66ed94c Gerrit-Change-Number: 34399 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 08:07:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts: Use PCUIF v11

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34398?usp=email ) Change subject: ttcn3-bts: Use PCUIF v11 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34398?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6c905d074ffc324dd72d6a5c9ce79f3c241ac780 Gerrit-Change-Number: 34398 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 08:06:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ci[master]: OBS: don't downgrade version in debian/changelog

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34395?usp=email ) Change subject: OBS: don't downgrade version in debian/changelog ...................................................................... OBS: don't downgrade version in debian/changelog Fix the bug that the version in debian/changelog could get lowered if a release was made and the release git tag was not pushed yet. Fixes: OS#6173 Change-Id: I550ed10a60c863626d870e35034028f0bd066211 --- M scripts/obs/data/build_srcpkg.Dockerfile M scripts/obs/lib/config.py M scripts/obs/lib/debian.py 3 files changed, 32 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/obs/data/build_srcpkg.Dockerfile b/scripts/obs/data/build_srcpkg.Dockerfile index 75482bc..5475a94 100644 --- a/scripts/obs/data/build_srcpkg.Dockerfile +++ b/scripts/obs/data/build_srcpkg.Dockerfile @@ -18,6 +18,7 @@ libxml2-utils \ meson \ osc \ + python3-packaging \ python3-setuptools \ rebar3 \ sed \ diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py index 038122b..3a3e9ad 100644 --- a/scripts/obs/lib/config.py +++ b/scripts/obs/lib/config.py @@ -25,6 +25,7 @@ ] required_python_modules = [ + "packaging", "setuptools", ] diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index 8a82e16..2995185 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -7,6 +7,13 @@ import lib import lib.git +# Imports that may not be available during startup, ignore it here and rely on +# lib.check_required_programs() checking this later on (possibly after the +# script executed itself in docker if using --docker). +try: + import packaging.version +except ImportError: + pass def control_add_depend(project, pkgname, version): """ :param pkgname: of the meta-package to depend on (e.g. osmocom-nightly) @@ -89,6 +96,16 @@ """ Adjust the changelog if the version in the changelog is different from the given version. """ version_changelog = get_last_version_from_changelog(project) + + # Don't use a lower number (OS#6173) + if packaging.version.parse(version_changelog.split("-")[0]) > \ + packaging.version.parse(version.split("-")[0]): + print(f"{project}: WARNING: version from changelog" + f" ({version_changelog}) is higher than version based on git tag" + f" ({version}), using version from changelog (git tag not pushed" + " yet?)") + return + if version_changelog == version: return -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34395?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I550ed10a60c863626d870e35034028f0bd066211 Gerrit-Change-Number: 34395 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 year, 9 months

1
0
0 0

[S] Change in osmo-ci[master]: OBS: don't downgrade version in debian/changelog

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34395?usp=email ) Change subject: OBS: don't downgrade version in debian/changelog ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34395?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I550ed10a60c863626d870e35034028f0bd066211 Gerrit-Change-Number: 34395 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 08:06:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-uecups[master]: .gitignore: Add contrib/osmo-uecups.spec

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/34396?usp=email ) Change subject: .gitignore: Add contrib/osmo-uecups.spec ...................................................................... .gitignore: Add contrib/osmo-uecups.spec Change-Id: I3feec5550a413b2ee9166b97d41e3feec409a320 --- M .gitignore 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/.gitignore b/.gitignore index ae25598..3187de0 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,6 @@ ttcn3/*.cc ttcn3/*.hh +contrib/osmo-uecups.spec daemon/osmo-uecups-daemon + -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/34396?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I3feec5550a413b2ee9166b97d41e3feec409a320 Gerrit-Change-Number: 34396 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-uecups[master]: .gitignore: Add contrib/osmo-uecups.spec

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/34396?usp=email ) Change subject: .gitignore: Add contrib/osmo-uecups.spec ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/34396?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I3feec5550a413b2ee9166b97d41e3feec409a320 Gerrit-Change-Number: 34396 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 13 Sep 2023 08:06:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-bsc[master]: struct gsm_bts_trx[_ts], gsm_abis_mo: drop unused nm_attr

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34324?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: struct gsm_bts_trx[_ts], gsm_abis_mo: drop unused nm_attr ...................................................................... struct gsm_bts_trx[_ts], gsm_abis_mo: drop unused nm_attr Change-Id: I36c3aaefa0bd9ee946a53ed537cf5c3bd7e9761e --- M include/osmocom/bsc/bts_trx.h M include/osmocom/bsc/gsm_data.h 2 files changed, 9 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h index 8d2493f..8ded559 100644 --- a/include/osmocom/bsc/bts_trx.h +++ b/include/osmocom/bsc/bts_trx.h @@ -43,7 +43,6 @@ struct e1inp_sign_link *oml_link; struct gsm_abis_mo mo; - struct tlv_parsed nm_attr; struct gsm_bts_bb_trx bb_transc; uint16_t arfcn; diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 7d36baa..7f79162 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -526,7 +526,6 @@ struct abis_om_obj_inst obj_inst; const char *name; struct gsm_nm_state nm_state; - struct tlv_parsed *nm_attr; struct gsm_bts *bts; struct osmo_fsm_inst *fi; bool opstart_sent; @@ -668,7 +667,6 @@ bool is_rsl_ready; struct gsm_abis_mo mo; - struct tlv_parsed nm_attr; uint8_t nm_chan_comb; int tsc; /* -1 == use BTS TSC */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34324?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I36c3aaefa0bd9ee946a53ed537cf5c3bd7e9761e Gerrit-Change-Number: 34324 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-uecups[master]: .gitignore: Add contrib/osmo-uecups.spec

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-uecups/+/34396?usp=email ) Change subject: .gitignore: Add contrib/osmo-uecups.spec ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-uecups/+/34396?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-uecups Gerrit-Branch: master Gerrit-Change-Id: I3feec5550a413b2ee9166b97d41e3feec409a320 Gerrit-Change-Number: 34396 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Sep 2023 22:03:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ci[master]: OBS: don't downgrade version in debian/changelog

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34395?usp=email ) Change subject: OBS: don't downgrade version in debian/changelog ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34395?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I550ed10a60c863626d870e35034028f0bd066211 Gerrit-Change-Number: 34395 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Sep 2023 22:03:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts: Use PCUIF v11

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34398?usp=email ) Change subject: ttcn3-bts: Use PCUIF v11 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34398?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6c905d074ffc324dd72d6a5c9ce79f3c241ac780 Gerrit-Change-Number: 34398 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Sep 2023 22:01:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023