Attention is currently required from: osmith, fixeria, dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29924 )
Change subject: Move UL allocation&assign functions to gprs_ms.c
......................................................................
Patch Set 3:
(2 comments)
File src/gprs_ms.c:
https://gerrit.osmocom.org/c/osmo-pcu/+/29924/comment/440e7954_7b5e12ee
PS3, Line 1091:
> unrelated
I changed it to have it all the functions looks similar. It may not be 100% related but not worth having a different patch for it given the huge amount of code I'm moving around.
File src/tbf_fsm.c:
https://gerrit.osmocom.org/c/osmo-pcu/+/29924/comment/de378965_2421a586
PS3, Line 105: ul_tbf_contention_resolution_start(ul_tbf);
> looks like a slight change in functionality - maybe explain in the commit message why this is needed […]
It's not really a change in in functionality, I'm just moving the function call here inside the FSM logic and dropping it from the function allocating the UL TBF.
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29924
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I256aeede2a2678c9738539fb6ec4db9766fa85e4
Gerrit-Change-Number: 29924
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Nov 2022 09:56:03 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29933 )
Change subject: tbf_ul: Assign DL-TBF if needed after UL-TBF has gone over contenion resolution
......................................................................
Patch Set 3: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29933
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ib8f7ad2390485ce9fd76a9de6cd349a5f4037568
Gerrit-Change-Number: 29933
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Nov 2022 09:00:29 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin, fixeria, dexter.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29924 )
Change subject: Move UL allocation&assign functions to gprs_ms.c
......................................................................
Patch Set 3:
(2 comments)
File src/gprs_ms.c:
https://gerrit.osmocom.org/c/osmo-pcu/+/29924/comment/3b6b34a2_f0ae84c9
PS3, Line 1091:
unrelated
File src/tbf_fsm.c:
https://gerrit.osmocom.org/c/osmo-pcu/+/29924/comment/197acaf5_a0189d8a
PS3, Line 105: ul_tbf_contention_resolution_start(ul_tbf);
looks like a slight change in functionality - maybe explain in the commit message why this is needed or split it out into a different patch?
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29924
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I256aeede2a2678c9738539fb6ec4db9766fa85e4
Gerrit-Change-Number: 29924
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
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-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Nov 2022 08:49:08 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29904 )
Change subject: jenkins-gerrit: send mail for V+1 for some users
......................................................................
jenkins-gerrit: send mail for V+1 for some users
Add a list of users that do not only get a notification mail when the
gerrit verification failed, but also on success.
Change-Id: I603b8a911c8f17aa726d9e3d5d644ad3262b42dd
---
M jobs/gerrit-pipeline-result.yml
M jobs/gerrit-verifications.yml
M scripts/jenkins-gerrit/pipeline_summary.py
M scripts/jenkins-gerrit/pipeline_summary_send.sh
4 files changed, 32 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/jobs/gerrit-pipeline-result.yml b/jobs/gerrit-pipeline-result.yml
index ac54cee..c3c03b6 100644
--- a/jobs/gerrit-pipeline-result.yml
+++ b/jobs/gerrit-pipeline-result.yml
@@ -38,6 +38,9 @@
name: GERRIT_PATCHSET_REVISION
description: set by gerrit verification pipeline job
- string:
+ name: GERRIT_PATCHSET_UPLOADER_NAME
+ description: set by gerrit verification pipeline job
+ - string:
name: GERRIT_PORT
description: set by gerrit verification pipeline job
- string:
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index a9616ff..9db1ebc 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -484,6 +484,7 @@
string(name: "GERRIT_BRANCH", value: "${{env.GERRIT_BRANCH}}"),
string(name: "GERRIT_HOST", value: "${{env.GERRIT_HOST}}"),
string(name: "GERRIT_PATCHSET_REVISION", value: "${{env.GERRIT_PATCHSET_REVISION}}"),
+ string(name: "GERRIT_PATCHSET_UPLOADER_NAME", value: "${{env.GERRIT_PATCHSET_UPLOADER_NAME}}"),
string(name: "GERRIT_PORT", value: "${{env.GERRIT_PORT}}"),
string(name: "GERRIT_REFSPEC", value: "${{env.GERRIT_REFSPEC}}"),
string(name: "PIPELINE_BUILD_URL", value: "${{env.BUILD_URL}}"),
diff --git a/scripts/jenkins-gerrit/pipeline_summary.py b/scripts/jenkins-gerrit/pipeline_summary.py
index 95ae821..44424d7 100755
--- a/scripts/jenkins-gerrit/pipeline_summary.py
+++ b/scripts/jenkins-gerrit/pipeline_summary.py
@@ -19,6 +19,9 @@
help="$BUILD_URL of the pipeline job, e.g."
" https://jenkins.osmocom.org/jenkins/job/gerrit-osmo-bsc-nat/17/")
parser.add_argument("-o", "--output", help="output json file")
+ parser.add_argument("-n", "--notify-on-success", action="store_true",
+ help="always indicate in json that the owner should be"
+ " notified via mail, not only on failure")
return parser.parse_args()
@@ -132,7 +135,7 @@
return ret
-def get_pipeline_summary(build_url):
+def get_pipeline_summary(build_url, notify_on_success):
""" Generate a summary of failed and successful builds for gerrit.
:returns: a dict that is expected by gerrit's set-review api, e.g.
{"tag": "jenkins",
@@ -179,7 +182,7 @@
else:
summary += "Build Successful\n"
vote = 1
- notify = "NONE"
+ notify = "OWNER" if notify_on_success else "NONE"
# Reference:
# https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#…
@@ -192,9 +195,11 @@
def main():
args = parse_args()
- summary = get_pipeline_summary(args.build_url)
+ summary = get_pipeline_summary(args.build_url, args.notify_on_success)
+ print()
print(summary["message"])
+ print(f"notify: {summary['notify']}")
if args.output:
with open(args.output, "w") as handle:
diff --git a/scripts/jenkins-gerrit/pipeline_summary_send.sh b/scripts/jenkins-gerrit/pipeline_summary_send.sh
index d52ad9f..c49f428 100755
--- a/scripts/jenkins-gerrit/pipeline_summary_send.sh
+++ b/scripts/jenkins-gerrit/pipeline_summary_send.sh
@@ -1,6 +1,24 @@
-#!/bin/sh -ex
+#!/bin/sh -e
-./pipeline_summary.py "$PIPELINE_BUILD_URL" -o gerrit_report.json
+# By default, a mail notification will only be sent if the gerrit verification
+# failed. Add yourself here to also receive notifications on successs.
+notify_on_success_users="
+ pespin
+"
+
+arg_notify=""
+for i in $notify_on_success_users; do
+ if [ "$GERRIT_PATCHSET_UPLOADER_NAME" = "$i" ]; then
+ arg_notify="--notify-on-success"
+ break
+ fi
+done
+
+set -x
+
+./pipeline_summary.py "$PIPELINE_BUILD_URL" \
+ -o gerrit_report.json \
+ $arg_notify
ssh \
-p "$GERRIT_PORT" \
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29904
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I603b8a911c8f17aa726d9e3d5d644ad3262b42dd
Gerrit-Change-Number: 29904
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
falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/29973 )
Change subject: msc_a: send MNCC_RTP_CONNECT in call waiting scenarios
......................................................................
msc_a: send MNCC_RTP_CONNECT in call waiting scenarios
In normal operation, when a call is established, TCH is assigned
where none existed previously, and when this assignment succeeds,
gsm48_tch_rtp_create() is called to communicate RTP stream info
to the external call agent via MNCC_RTP_CREATE message. However,
in a call waiting scenario, TCH already exists from call 1 and
there is no new channel assignment to be made for call 2 - instead
the same TCH is expected to be reused as the user switches between
calls.
The problem, however, is that because no new channel assignment is
made, the external MNCC agent never receives an MNCC_RTP_CREATE for
call 2 - and without RTP stream info that call cannot be connected,
and thus call 2 establishment fails.
The present patch is a hack that makes call waiting work in basic
usage testing: in the already-detected case of "Another call
is already ongoing" in msc_a_try_call_assignment(), simply call
gsm48_tch_rtp_create() and hope that a successful channel assignment
has already been made, and that the existing TCH is good enough for
the new call which could have different bearer capabilities and thus
different TCH requirements.
Related: OS#5699
Change-Id: Ibb62cb3c154b99769b2dfe708f73c20e8b632f5d
---
M src/libmsc/msc_a.c
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/73/29973/1
diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c
index d7e97cd..e909fd0 100644
--- a/src/libmsc/msc_a.c
+++ b/src/libmsc/msc_a.c
@@ -1797,6 +1797,8 @@
if (msc_a->cc.active_trans) {
LOG_MSC_A(msc_a, LOGL_INFO, "Another call is already ongoing, not assigning yet\n");
+ /* a hack to make call waiting work */
+ gsm48_tch_rtp_create(cc_trans);
return 0;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29973
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ibb62cb3c154b99769b2dfe708f73c20e8b632f5d
Gerrit-Change-Number: 29973
Gerrit-PatchSet: 1
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-MessageType: newchange