osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34249 )
Change subject: jobs/master-builds: xgoldmon: remove osmo-ci dir
......................................................................
jobs/master-builds: xgoldmon: remove osmo-ci dir
Fix running the job multiple times in a row. As the master jobs don't
wipe the git repositories, we need to remove the osmo-ci dir first
before attempting another shallow clone.
Fixes: 451cbe7d ("jobs/master-builds: add xgoldmon")
Change-Id: I877944dbca9d1c3ca57b05e947ba9b3506971bdc
---
M jobs/master-builds.yml
1 file changed, 15 insertions(+), 0 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/master-builds.yml b/jobs/master-builds.yml
index f57bc96..b102563 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -529,6 +529,7 @@
- xgoldmon:
git_base_url: https://github.com/2b-as
cmd: |
+ rm -rf osmo-ci
git clone --depth=1 https://gerrit.osmocom.org/osmo-ci -b master
{docker_run_ccache} {docker_img} {timeout_cmd} /build/osmo-ci/scripts/xgoldmon-jenkins.sh
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34249
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I877944dbca9d1c3ca57b05e947ba9b3506971bdc
Gerrit-Change-Number: 34249
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
Attention is currently required from: Hoernchen.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34251 )
Change subject: ms: fix a few coverity complaints related to initialization
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34251
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I203f4da7a4418fc5053d26901bec649d04fad096
Gerrit-Change-Number: 34251
Gerrit-PatchSet: 3
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 13:24:33 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Hoernchen.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34250 )
Change subject: ms: fix thread prio startup issue
......................................................................
Patch Set 3:
(2 comments)
File Transceiver52M/ms/ms.h:
https://gerrit.osmocom.org/c/osmo-trx/+/34250/comment/f1fd7c29_5edd2639
PS3, Line 388: if(
if is not a function (the linter should have complained?)
File osmocom-bb:
https://gerrit.osmocom.org/c/osmo-trx/+/34250/comment/65021001_f18d0d16
PS3, Line 1: fb384998fbddcc545eec76da41db1aa41b583aa9
This change looks unrelated. Bumping submodule version should be done in a separate patch.
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34250
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b
Gerrit-Change-Number: 34250
Gerrit-PatchSet: 3
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 13:23:47 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/34246 )
Change subject: Catch and forbid configuring peers before configuring main protocol node
......................................................................
Catch and forbid configuring peers before configuring main protocol node
When the user enters each "peer" node, the related object is created if
not yet existing, and its updated config is applied (connect()) upon
exiting the node (cbc_peer_apply_cfg_chg()). When connect happens, it
needs to obtain the local IP address from the main protocol node
(cbsp|sbcap)", which means it must be configured beforehand, otherwise
the peers connect using the default values.
Hence, it makes no sense to configure peers if the main protocol
information has not yet been configured. The usual example configs as
well as the write-config VTY commands provide correct order of things.
Catch and forbid the user providing a config file where the peers are
configured before the main protocol nodes.
Related: OS#6154
Change-Id: I678f9e6715c85b1eb9116cc892f1a8299577c0c2
---
M include/osmocom/cbc/cbc_data.h
M src/cbc_main.c
M src/cbc_vty.c
3 files changed, 49 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h
index 6d64f04..d5e5cde 100644
--- a/include/osmocom/cbc/cbc_data.h
+++ b/include/osmocom/cbc/cbc_data.h
@@ -57,11 +57,13 @@
struct {
char *local_host;
int local_port;
+ bool configured;
} cbsp;
struct {
char *local_host[CBC_MAX_LOC_ADDRS];
unsigned int num_local_host;
int local_port;
+ bool configured;
} sbcap;
struct {
char *local_host;
diff --git a/src/cbc_main.c b/src/cbc_main.c
index e75b328..c777ef6 100644
--- a/src/cbc_main.c
+++ b/src/cbc_main.c
@@ -108,12 +108,16 @@
static int cbc_vty_go_parent(struct vty *vty)
{
switch (vty->node) {
+ case CBSP_NODE:
+ g_cbc->config.cbsp.configured = true;
+ break;
case SBcAP_NODE:
/* If no local addr set, add a default one: */
if (g_cbc->config.sbcap.num_local_host == 0) {
g_cbc->config.sbcap.local_host[0] = talloc_strdup(g_cbc, "127.0.0.1");
g_cbc->config.sbcap.num_local_host = 1;
}
+ g_cbc->config.sbcap.configured = true;
vty->node = CONFIG_NODE;
vty->index = NULL;
break;
diff --git a/src/cbc_vty.c b/src/cbc_vty.c
index 631ef96..12b7d7b 100644
--- a/src/cbc_vty.c
+++ b/src/cbc_vty.c
@@ -576,6 +576,26 @@
enum cbc_peer_protocol proto;
proto = get_string_value(cbc_peer_proto_name_vty, argv[0]);
+ switch (proto) {
+ case CBC_PEER_PROTO_CBSP:
+ if (!g_cbc->config.cbsp.configured) {
+ vty_out(vty, "%% Node '%s' must be configured before configuring node 'peer'!%s",
+ argv[0], VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ break;
+ case CBC_PEER_PROTO_SBcAP:
+ if (!g_cbc->config.sbcap.configured) {
+ vty_out(vty, "%% Node '%s' must be configured before configuring node 'peer'!%s",
+ argv[0], VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+ break;
+ case CBC_PEER_PROTO_SABP:
+ default:
+ return CMD_WARNING;
+ }
+
peer = cbc_peer_by_name(argv[1]);
if (!peer)
peer = cbc_peer_create(argv[1], proto);
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/34246
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: I678f9e6715c85b1eb9116cc892f1a8299577c0c2
Gerrit-Change-Number: 34246
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-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: pespin.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34192 )
Change subject: pcuif_proto: check confirm flag in struct gsm_pcu_if_pch
......................................................................
Patch Set 5:
(1 comment)
Patchset:
PS5:
> +1 now, and we decided we shall move the pagingCmd forwarding to follow the usual PCH queue in pagin […]
As discussed we will fix this in a follow up patch. I have a created a ticket for this. https://osmocom.org/issues/6159
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34192
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I3d2842626b7e8325860ea3160c7d900d39e953a0
Gerrit-Change-Number: 34192
Gerrit-PatchSet: 5
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 30 Aug 2023 12:39:45 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: Hoernchen.
Hello Jenkins Builder, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-trx/+/34250
to look at the new patch set (#3).
Change subject: ms: fix thread prio startup issue
......................................................................
ms: fix thread prio startup issue
This fixes the 20 second startup delay caused by tx/control threads
getting temporarily stuck while trying to set their own priority.
Apparently the only sane way for core affinity+priority is to set both
as attributes during thread creation using pthreads.
This switches the cmd queue to the timeout version, too, to ensure the
thread doesn't get stuck waiting for messages, and allows cleaner exits.
Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b
---
M Transceiver52M/ms/ms.h
M Transceiver52M/ms/ms_trxcon_if.h
M Transceiver52M/ms/ms_upper.cpp
M Transceiver52M/ms/ms_upper.h
M osmocom-bb
5 files changed, 111 insertions(+), 31 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/50/34250/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34250
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: I7e2f83a9b9df024acaf9076c58189cb6b7bcc34b
Gerrit-Change-Number: 34250
Gerrit-PatchSet: 3
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-MessageType: newpatchset