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

[S] Change in ...osmo-epdg[master]: gitreview: new file
by osmith 05 Oct '23

05 Oct '23

Attention is currently required from: osmith. osmith has removed a vote from this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34668?usp=email ) Change subject: gitreview: new file ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34668?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I3e00e433f57df47e0d873d8405fae55c6656781f Gerrit-Change-Number: 34668 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 0

[S] Change in ...osmo-epdg[master]: debian/changelog: add initial entry
by osmith 05 Oct '23

05 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34670?usp=email ) Change subject: debian/changelog: add initial entry ...................................................................... debian/changelog: add initial entry This is required for building a debian package. Change-Id: I31ed8cdffa76b81073cdbc6a5a4b74d6520be903 --- M debian/changelog 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 8b13789..a551727 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1 +1,6 @@ +osmo-epdg (0.0.0) unstable; urgency=medium + + Initial + + -- Oliver Smith <osmith(a)sysmocom.de> Thu, 28 Sep 2023 13:53:07 +0200 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I31ed8cdffa76b81073cdbc6a5a4b74d6520be903 Gerrit-Change-Number: 34670 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ci[master]: obs: srcpkg: support having no git tags
by osmith 05 Oct '23

05 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34669?usp=email ) Change subject: obs: srcpkg: support having no git tags ...................................................................... obs: srcpkg: support having no git tags Instead of failing when a project has no git-version-gen script, and no git tags, use 0.0.0 as version. This is needed for the new osmo-epdg project, which doesn't have tags yet. Change-Id: I2f0f409feb96611095dfa511a33ea730e5bbf3e4 --- M scripts/obs/lib/srcpkg.py 1 file changed, 28 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 324bc66..9476d82 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -42,11 +42,24 @@ pattern = lib.git.get_latest_tag_pattern(project) pattern = pattern.replace("^", "", 1) pattern = pattern.replace("$", "", -1) - ret = lib.run_cmd(["git", "describe", + result = lib.run_cmd(["git", "describe", "--abbrev=4", "--tags", f"--match={pattern}", - "HEAD"], cwd=repo_path).output.rstrip() + "HEAD"], cwd=repo_path, check=False) + + if result.returncode == 128: + print(f"{project}: has no git tags, using 0.0.0 as version") + commit = lib.run_cmd(["git", "rev-parse", "HEAD"], + cwd=repo_path).output[0:4] + count = lib.run_cmd(["git", "rev-list", "--count", "HEAD"], + cwd=repo_path).output.rstrip() + return f"0.0.0.{count}-{commit}" + + if result.returncode != 0: + lib.exit_error_cmd(result, "command failed unexpectedly") + + ret = result.output.rstrip() # Like git-version-gen: # * Change the first '-' to '.' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34669?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: I2f0f409feb96611095dfa511a33ea730e5bbf3e4 Gerrit-Change-Number: 34669 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: debian/changelog: add initial entry
by pespin 05 Oct '23

05 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34670?usp=email ) Change subject: debian/changelog: add initial entry ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I31ed8cdffa76b81073cdbc6a5a4b74d6520be903 Gerrit-Change-Number: 34670 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Oct 2023 16:16:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: obs: srcpkg: support having no git tags
by pespin 05 Oct '23

05 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34669?usp=email ) Change subject: obs: srcpkg: support having no git tags ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34669?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: I2f0f409feb96611095dfa511a33ea730e5bbf3e4 Gerrit-Change-Number: 34669 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 05 Oct 2023 16:16:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: debian/changelog: add initial entry
by osmith 05 Oct '23

05 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34670?usp=email ) Change subject: debian/changelog: add initial entry ...................................................................... debian/changelog: add initial entry This is required for building a debian package. Change-Id: I31ed8cdffa76b81073cdbc6a5a4b74d6520be903 --- M debian/changelog 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/70/34670/1 diff --git a/debian/changelog b/debian/changelog index 8b13789..a551727 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1 +1,6 @@ +osmo-epdg (0.0.0) unstable; urgency=medium + + Initial + + -- Oliver Smith <osmith(a)sysmocom.de> Thu, 28 Sep 2023 13:53:07 +0200 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34670?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I31ed8cdffa76b81073cdbc6a5a4b74d6520be903 Gerrit-Change-Number: 34670 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ci[master]: obs: srcpkg: support having no git tags
by osmith 05 Oct '23

05 Oct '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34669?usp=email ) Change subject: obs: srcpkg: support having no git tags ...................................................................... obs: srcpkg: support having no git tags Instead of failing when a project has no git-version-gen script, and no git tags, use 0.0.0 as version. This is needed for the new osmo-epdg project, which doesn't have tags yet. Change-Id: I2f0f409feb96611095dfa511a33ea730e5bbf3e4 --- M scripts/obs/lib/srcpkg.py 1 file changed, 28 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/69/34669/1 diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 324bc66..9476d82 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -42,11 +42,24 @@ pattern = lib.git.get_latest_tag_pattern(project) pattern = pattern.replace("^", "", 1) pattern = pattern.replace("$", "", -1) - ret = lib.run_cmd(["git", "describe", + result = lib.run_cmd(["git", "describe", "--abbrev=4", "--tags", f"--match={pattern}", - "HEAD"], cwd=repo_path).output.rstrip() + "HEAD"], cwd=repo_path, check=False) + + if result.returncode == 128: + print(f"{project}: has no git tags, using 0.0.0 as version") + commit = lib.run_cmd(["git", "rev-parse", "HEAD"], + cwd=repo_path).output[0:4] + count = lib.run_cmd(["git", "rev-list", "--count", "HEAD"], + cwd=repo_path).output.rstrip() + return f"0.0.0.{count}-{commit}" + + if result.returncode != 0: + lib.exit_error_cmd(result, "command failed unexpectedly") + + ret = result.output.rstrip() # Like git-version-gen: # * Change the first '-' to '.' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34669?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: I2f0f409feb96611095dfa511a33ea730e5bbf3e4 Gerrit-Change-Number: 34669 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-gprs[master]: rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time
by pespin 05 Oct '23

05 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34667?usp=email ) Change subject: rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time ...................................................................... rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time The previous logic was wrongly written. We want: * If PKT UL ASS didn't have a tbf_starting_time but had an S/P+RRBP, it means we have to delay completing the FSM until we send the PKT CTRL ACK (next_blk) * If it contained tbf_starting_time, if it happens before next_blk, still wait until next_blk Change-Id: I60cdc0315e28f71843c51eba88acc78780c6ab43 --- M src/rlcmac/tbf_ul_ass_fsm.c 1 file changed, 16 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/src/rlcmac/tbf_ul_ass_fsm.c b/src/rlcmac/tbf_ul_ass_fsm.c index 1783d5b..1c67213 100644 --- a/src/rlcmac/tbf_ul_ass_fsm.c +++ b/src/rlcmac/tbf_ul_ass_fsm.c @@ -413,7 +413,7 @@ /* We need to wait at least until sending the PKT CTRL * ACK (in the old CTRL TS) before completing the * assignment and using the new TS assignment. */ - if (!ctx->tbf_starting_time_exists && gsm0502_fncmp(ctx->tbf_starting_time, next_blk) < 0) { + if (!ctx->tbf_starting_time_exists || gsm0502_fncmp(ctx->tbf_starting_time, next_blk) < 0) { ctx->tbf_starting_time_exists = true; ctx->tbf_starting_time = next_blk; } @@ -474,7 +474,7 @@ /* We need to wait at least until sending the PKT CTRL * ACK (in the old CTRL TS) before completing the * assignment and using the new TS assignment. */ - if (!ctx->tbf_starting_time_exists && gsm0502_fncmp(ctx->tbf_starting_time, next_blk) < 0) { + if (!ctx->tbf_starting_time_exists || gsm0502_fncmp(ctx->tbf_starting_time, next_blk) < 0) { ctx->tbf_starting_time_exists = true; ctx->tbf_starting_time = next_blk; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34667?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I60cdc0315e28f71843c51eba88acc78780c6ab43 Gerrit-Change-Number: 34667 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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 0

[S] Change in libosmo-gprs[master]: rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time
by fixeria 05 Oct '23

05 Oct '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34667?usp=email ) Change subject: rlcmac: tbf_ul_ass_fsm: Fix logic delay starting time ...................................................................... Patch Set 2: Verified+1 Code-Review+2 (1 comment) Patchset: PS2: Tested, confirmed to fix various issues. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34667?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I60cdc0315e28f71843c51eba88acc78780c6ab43 Gerrit-Change-Number: 34667 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: Thu, 05 Oct 2023 15:58:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: Add .gitignore
by pespin 05 Oct '23

05 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34653?usp=email ) Change subject: Add .gitignore ...................................................................... Add .gitignore Change-Id: Ia2d93a81d94a34d0a869c6e135d13109cc5e2522 --- A .gitignore 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved; Verified osmith: Looks good to me, but someone else must approve diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..08ae348 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +_build/ +include/ +log/ + +*.beam +erl_crash.dump + +src/diameter_3gpp* +src/diameter_rfc* +src/diameter_etsi* -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34653?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ia2d93a81d94a34d0a869c6e135d13109cc5e2522 Gerrit-Change-Number: 34653 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0