laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28344 )
Change subject: Don't let this osmo-msc operate on a libdbi database
......................................................................
Don't let this osmo-msc operate on a libdbi database
The Binary format changed when libdbi was removed. If we let osmo-msc run on an
unconverted database, the results are unpredictable, certainly undesirable.
Change-Id: I887b6a4374b1c83684f4007e9791ae58bba4e8c1
---
M src/libmsc/db.c
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/libmsc/db.c b/src/libmsc/db.c
index 07081d5..0237716 100644
--- a/src/libmsc/db.c
+++ b/src/libmsc/db.c
@@ -72,7 +72,7 @@
* DATABASE SCHEMA AND MIGRATION
***********************************************************************/
-#define SCHEMA_REVISION "5"
+#define SCHEMA_REVISION "6"
enum {
SCHEMA_META,
@@ -480,14 +480,14 @@
LOGP(DDB, LOGL_FATAL, "You must use osmo-msc 1.1.0 to 1.8.0 to upgrade database "
"schema from '%u' to '5', sorry\n", db_rev);
break;
-#if 0
case 5:
- if (update_db_revision_5())
- goto error;
-
- /* The end of waterfall */
+ LOGP(DDB, LOGL_FATAL, "The storage format of BINARY data in the database "
+ "has changed. In order to deliver any pending SMS in your database, "
+ "you must manually convert your database from "
+ "'%u' to '6'. Alternatively you can use a fresh, blank database "
+ "with this version of osmo-msc, sorry.\n", db_rev);
+ return -1;
break;
-#endif
default:
LOGP(DDB, LOGL_FATAL, "Invalid database schema revision '%d'.\n", db_rev);
return -EINVAL;
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28344
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I887b6a4374b1c83684f4007e9791ae58bba4e8c1
Gerrit-Change-Number: 28344
Gerrit-PatchSet: 3
Gerrit-Owner: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
Attention is currently required from: keith.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28344 )
Change subject: Don't let this osmo-msc operate on a libdbi database
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28344
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I887b6a4374b1c83684f4007e9791ae58bba4e8c1
Gerrit-Change-Number: 28344
Gerrit-PatchSet: 3
Gerrit-Owner: keith <keith(a)rhizomatica.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: keith <keith(a)rhizomatica.org>
Gerrit-Comment-Date: Thu, 30 Jun 2022 20:44:34 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28326 )
Change subject: lchan_select: prepare a list of timeslots once, iterate over it
......................................................................
lchan_select: prepare a list of timeslots once, iterate over it
The lchan_avail_by_type() attempts to find an unused lchan for the
given GSM_LCHAN_* value: TCH/F, TCH/H, or SDCCH. This is achieved
by looking up timeslots with compatible GSM_PCHAN_* values.
For instance, finding an unused SDCCH lchan may involve:
* attempt to find a timeslot with pchan=GSM_PCHAN_CCCH_SDCCH4,
* attempt to find a timeslot with pchan=GSM_PCHAN_CCCH_SDCCH4_CBCH,
* attempt to find a timeslot with pchan=GSM_PCHAN_SDCCH8_SACCH8C,
* attempt to find a timeslot with pchan=GSM_PCHAN_SDCCH8_SACCH8C_CBCH,
* attempt to find a timeslot with pchan=GSM_PCHAN_OSMO_DYN (switched),
* attempt to find a timeslot with pchan=GSM_PCHAN_OSMO_DYN (not switched).
Each attempt involves iterating over all timeslots of each TRX,
either in ascending or in descending order (see _lc_dyn_find_bts()
and _lc_find_trx()).
This patch simplifies the lookup logic by preparing a monolithic
array of timeslot pointers once, and then using that array for
each GSM_PCHAN_* lookup attempt. This change is required for the
upcoming dynamic channel allocation mode, which is fa more complex
than the existing ascending/descending ones.
A side effect of this change is that the interference aware mode
of allocation is not limited by the scope of a single TRX anymore.
Interference levels are now compared within the scope of the whole
BTS, so that lchans on the other TRXes may be picked if they are
better according to the interference reports from the BTS.
Change-Id: I7ccc56856bfd40fd7c63b7437736de60c2b516ff
Related: SYS#5460
---
M doc/manuals/chapters/chan_alloc.adoc
M src/osmo-bsc/lchan_select.c
2 files changed, 86 insertions(+), 75 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/doc/manuals/chapters/chan_alloc.adoc b/doc/manuals/chapters/chan_alloc.adoc
index 3a6d41a..d995124 100644
--- a/doc/manuals/chapters/chan_alloc.adoc
+++ b/doc/manuals/chapters/chan_alloc.adoc
@@ -59,10 +59,11 @@
1 In channel allocation, prefer lchans with less interference.
----
-NOTE: Interference levels are compared within the scope of a single TRX, which
-is selected with respect to the configured allocation mode. This means that
-the selection logic would ignore channels on the other TRXes, even if they
-are better according to the interference reports from the BTS.
+NOTE: Interference levels are compared within the scope of the whole BTS. This
+means that the selection logic may pick channels on the other TRXes, if they are
+better according to the interference reports from the BTS. This feature makes
+the allocation order non-deterministic and therefore nullifies the meaning of
+channel allocation modes described above.
==== TCH sigalling policy
diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c
index ad45dc7..a322f07 100644
--- a/src/osmo-bsc/lchan_select.c
+++ b/src/osmo-bsc/lchan_select.c
@@ -2,7 +2,7 @@
*
* (C) 2008 by Harald Welte <laforge(a)gnumonks.org>
* (C) 2008, 2009 by Holger Hans Peter Freyther <zecke(a)selfish.org>
- * (C) 2018 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
+ * (C) 2018-2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de>
*
* All Rights Reserved
*
@@ -30,6 +30,11 @@
#include <osmocom/bsc/lchan_select.h>
#include <osmocom/bsc/bts.h>
+struct lchan_select_ts_list {
+ struct gsm_bts_trx_ts **list;
+ unsigned int num;
+};
+
static struct gsm_lchan *pick_better_lchan(struct gsm_lchan *a, struct gsm_lchan *b)
{
if (!a)
@@ -42,14 +47,13 @@
return a;
}
-static struct gsm_lchan *
-_lc_find_trx(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan,
- enum gsm_phys_chan_config as_pchan, bool allow_pchan_switch, bool log)
+static struct gsm_lchan *_lc_find(struct lchan_select_ts_list *ts_list,
+ enum gsm_phys_chan_config pchan,
+ enum gsm_phys_chan_config as_pchan,
+ bool allow_pchan_switch, bool log)
{
struct gsm_lchan *lchan;
struct gsm_lchan *found_lchan = NULL;
- struct gsm_bts_trx_ts *ts;
- int j, start, stop, dir;
#define LOGPLCHANALLOC(fmt, args...) do { \
if (log) \
@@ -61,28 +65,10 @@
## args); \
} while (0)
- if (!trx_is_usable(trx)) {
- LOGPLCHANALLOC("%s trx not usable\n", gsm_trx_name(trx));
- return NULL;
- }
-
- if (trx->bts->chan_alloc_reverse) {
- /* check TS 7..0 */
- start = 7;
- stop = -1;
- dir = -1;
- } else {
- /* check TS 0..7 */
- start = 0;
- stop = 8;
- dir = 1;
- }
-
- for (j = start; j != stop; j += dir) {
+ for (unsigned int tn = 0; tn < ts_list->num; tn++) {
+ struct gsm_bts_trx_ts *ts = ts_list->list[tn];
int lchans_as_pchan;
- ts = &trx->ts[j];
- if (!ts_is_usable(ts))
- continue;
+
/* The caller first selects what kind of TS to search in, e.g. looking for exact
* GSM_PCHAN_TCH_F, or maybe among dynamic GSM_PCHAN_OSMO_DYN... */
if (ts->pchan_on_init != pchan) {
@@ -125,7 +111,7 @@
/* When picking an lchan with least interference, continue to loop across all lchans. When
* ignoring interference levels, return the first match. */
- if (found_lchan && !trx->bts->chan_alloc_avoid_interf)
+ if (found_lchan && !ts->trx->bts->chan_alloc_avoid_interf)
return found_lchan;
}
}
@@ -141,44 +127,31 @@
#undef LOGPLCHANALLOC
}
-static struct gsm_lchan *
-_lc_dyn_find_bts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan,
- enum gsm_phys_chan_config dyn_as_pchan, bool log)
+static struct gsm_lchan *lc_dyn_find(struct lchan_select_ts_list *ts_list,
+ enum gsm_phys_chan_config pchan,
+ enum gsm_phys_chan_config dyn_as_pchan,
+ bool log)
{
- struct gsm_bts_trx *trx;
- struct gsm_lchan *lc;
- int allow_pchan_switch;
- bool try_pchan_switch;
+ struct gsm_lchan *lchan;
/* First find an lchan that needs no change in its timeslot pchan mode.
* In particular, this ensures that handover to a dynamic timeslot in TCH/H favors timeslots that are currently
* using only one of two TCH/H, so that we don't switch more dynamic timeslots to TCH/H than necessary.
* For non-dynamic timeslots, it is not necessary to do a second pass with allow_pchan_switch ==
* true, because they never switch anyway. */
- try_pchan_switch = (pchan != dyn_as_pchan);
- for (allow_pchan_switch = 0; allow_pchan_switch <= (try_pchan_switch ? 1 : 0); allow_pchan_switch++) {
- if (bts->chan_alloc_reverse) {
- llist_for_each_entry_reverse(trx, &bts->trx_list, list) {
- lc = _lc_find_trx(trx, pchan, dyn_as_pchan, (bool)allow_pchan_switch, log);
- if (lc)
- return lc;
- }
- } else {
- llist_for_each_entry(trx, &bts->trx_list, list) {
- lc = _lc_find_trx(trx, pchan, dyn_as_pchan, (bool)allow_pchan_switch, log);
- if (lc)
- return lc;
- }
- }
- }
+ if ((lchan = _lc_find(ts_list, pchan, dyn_as_pchan, false, log)))
+ return lchan;
+ if ((lchan = _lc_find(ts_list, pchan, dyn_as_pchan, true, log)))
+ return lchan;
return NULL;
}
-static struct gsm_lchan *
-_lc_find_bts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan, bool log)
+static struct gsm_lchan *lc_find(struct lchan_select_ts_list *ts_list,
+ enum gsm_phys_chan_config pchan,
+ bool log)
{
- return _lc_dyn_find_bts(bts, pchan, pchan, log);
+ return _lc_find(ts_list, pchan, pchan, false, log);
}
enum gsm_chan_t chan_mode_to_chan_type(enum gsm48_chan_mode chan_mode, enum channel_rate chan_rate)
@@ -215,6 +188,35 @@
}
}
+static void populate_ts_list(struct lchan_select_ts_list *ts_list,
+ struct gsm_bts *bts,
+ bool log)
+{
+ struct gsm_bts_trx *trx;
+ unsigned int num = 0;
+
+ llist_for_each_entry(trx, &bts->trx_list, list) {
+ for (unsigned int tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) {
+ struct gsm_bts_trx_ts *ts = &trx->ts[tn];
+ if (ts_is_usable(ts))
+ ts_list->list[num++] = ts;
+ else if (log)
+ LOGP(DRLL, LOGL_DEBUG, "%s is not usable\n", gsm_ts_name(ts));
+ }
+ }
+
+ ts_list->num = num;
+
+ /* Reverse the timeslot list if required */
+ if (bts->chan_alloc_reverse) {
+ for (unsigned int tn = 0; tn < num / 2; tn++) {
+ struct gsm_bts_trx_ts *temp = ts_list->list[tn];
+ ts_list->list[tn] = ts_list->list[num - tn - 1];
+ ts_list->list[num - tn - 1] = temp;
+ }
+ }
+}
+
struct gsm_lchan *lchan_select_by_chan_mode(struct gsm_bts *bts,
enum gsm48_chan_mode chan_mode, enum channel_rate chan_rate)
{
@@ -228,10 +230,19 @@
{
struct gsm_lchan *lchan = NULL;
enum gsm_phys_chan_config first, first_cbch, second, second_cbch;
+ struct lchan_select_ts_list ts_list;
if (log)
LOG_BTS(bts, DRLL, LOGL_DEBUG, "lchan_avail_by_type(%s)\n", gsm_lchant_name(type));
+ /* Allocate an array with pointers to all timeslots of a BTS */
+ ts_list.list = talloc_array_ptrtype(bts, ts_list.list, bts->num_trx * 8);
+ if (OSMO_UNLIKELY(ts_list.list == NULL))
+ return NULL;
+
+ /* Populate this array with the actual pointers */
+ populate_ts_list(&ts_list, bts, log);
+
switch (type) {
case GSM_LCHAN_SDCCH:
if (bts->chan_alloc_reverse) {
@@ -246,46 +257,45 @@
second_cbch = GSM_PCHAN_SDCCH8_SACCH8C_CBCH;
}
- lchan = _lc_find_bts(bts, first, log);
+ lchan = lc_find(&ts_list, first, log);
if (lchan == NULL)
- lchan = _lc_find_bts(bts, first_cbch, log);
+ lchan = lc_find(&ts_list, first_cbch, log);
if (lchan == NULL)
- lchan = _lc_find_bts(bts, second, log);
+ lchan = lc_find(&ts_list, second, log);
if (lchan == NULL)
- lchan = _lc_find_bts(bts, second_cbch, log);
+ lchan = lc_find(&ts_list, second_cbch, log);
/* No dedicated SDCCH available -- try fully dynamic
* TCH/F_TCH/H_SDCCH8_PDCH if BTS supports it: */
if (lchan == NULL && osmo_bts_has_feature(&bts->features, BTS_FEAT_DYN_TS_SDCCH8))
- lchan = _lc_dyn_find_bts(bts,
- GSM_PCHAN_OSMO_DYN,
- GSM_PCHAN_SDCCH8_SACCH8C, log);
+ lchan = lc_dyn_find(&ts_list, GSM_PCHAN_OSMO_DYN,
+ GSM_PCHAN_SDCCH8_SACCH8C, log);
break;
case GSM_LCHAN_TCH_F:
- lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F, log);
+ lchan = lc_find(&ts_list, GSM_PCHAN_TCH_F, log);
/* If we don't have TCH/F available, try dynamic TCH/F_PDCH */
if (!lchan)
- lchan = _lc_dyn_find_bts(bts, GSM_PCHAN_TCH_F_PDCH,
- GSM_PCHAN_TCH_F, log);
+ lchan = lc_dyn_find(&ts_list, GSM_PCHAN_TCH_F_PDCH,
+ GSM_PCHAN_TCH_F, log);
/* Try fully dynamic TCH/F_TCH/H_PDCH as TCH/F... */
if (!lchan && bts->network->dyn_ts_allow_tch_f)
- lchan = _lc_dyn_find_bts(bts,
- GSM_PCHAN_OSMO_DYN,
- GSM_PCHAN_TCH_F, log);
+ lchan = lc_dyn_find(&ts_list, GSM_PCHAN_OSMO_DYN,
+ GSM_PCHAN_TCH_F, log);
break;
case GSM_LCHAN_TCH_H:
- lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_H, log);
+ lchan = lc_find(&ts_list, GSM_PCHAN_TCH_H, log);
/* No dedicated TCH/x available -- try fully dynamic
* TCH/F_TCH/H_PDCH */
if (!lchan)
- lchan = _lc_dyn_find_bts(bts,
- GSM_PCHAN_OSMO_DYN,
- GSM_PCHAN_TCH_H, log);
+ lchan = lc_dyn_find(&ts_list, GSM_PCHAN_OSMO_DYN,
+ GSM_PCHAN_TCH_H, log);
break;
default:
LOG_BTS(bts, DRLL, LOGL_ERROR, "Unknown gsm_chan_t %u\n", type);
}
+ talloc_free(ts_list.list);
+
return lchan;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28326
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I7ccc56856bfd40fd7c63b7437736de60c2b516ff
Gerrit-Change-Number: 28326
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: osmith, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28327 )
Change subject: lchan_select: allow different alloc order for assignment and handover
......................................................................
Patch Set 2: Code-Review+2
(2 comments)
Patchset:
PS2:
1+1
File src/osmo-bsc/bts_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/28327/comment/3afc15ab_a685eb8c
PS2, Line 4246: vty_out(vty, " channel allocator mode chan-req %s%s",
> possibly output one set-all line instead if it is the same for all three?
Good idea, I will implement it in a separate patch.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28327
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I3ae73b36ee9433cc768376b56f0765e5f416162f
Gerrit-Change-Number: 28327
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(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-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 30 Jun 2022 16:36:29 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith, laforge, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28328 )
Change subject: lchan_select: implement dynamic selection mode for assignment
......................................................................
Patch Set 5:
(2 comments)
File src/osmo-bsc/abis_rsl.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/28328/comment/06c006a8_46d52046
PS5, Line 2010: if (lchan_avail_by_type(rqd->bts, GSM_LCHAN_TCH_F, SELECT_FOR_MS_CHAN_REQ, NULL, true)) {
> why pass NULL as ctx, isn't there any other talloc context available to hang this on that makes more […]
It's not a talloc context. Actually it's a context of the channel selection/allocation. I am passing NULL in the most cases (chan-req, handover) and a pointer to the current lchan during TCH channel assignment.
File src/osmo-bsc/lchan_select.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/28328/comment/258938cc_9c9ea243
PS5, Line 271: } while (0)
> why add this instead of using a separate log category where one could enable/disable logging with th […]
Conditional logging was here before my patches, I am not adding anything new. I guess it's done on purpose: some functions like _select_sdcch_for_call() from abis_rsl.c or candidate_set_free_tch() from handover_decision_2.c call it with log=false. Most likely, logging is not needed in these cases.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28328
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I1b7a0d706976b73cc5c30a8714b830811addfe8d
Gerrit-Change-Number: 28328
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 30 Jun 2022 16:35:21 +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.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28496 )
Change subject: Move peer to DELETED state before signalling parent FSM with DELETE_(N)ACK
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28496
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: Idb418728e1242fc5436355ccf73f20b1419e1eb8
Gerrit-Change-Number: 28496
Gerrit-PatchSet: 1
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, 30 Jun 2022 16:02:21 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28493 )
Change subject: Configure libosmocore logging system as multithread
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28493
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: Ic06edc19d22b90e2b6b7de3a25d62cda5001f46e
Gerrit-Change-Number: 28493
Gerrit-PatchSet: 1
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, 30 Jun 2022 16:01:38 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28496 )
Change subject: Move peer to DELETED state before signalling parent FSM with DELETE_(N)ACK
......................................................................
Move peer to DELETED state before signalling parent FSM with DELETE_(N)ACK
When receiving SMSCB_E_CBSP_DELETE_(N)ACK, smscb_message_fsm will iterate
over all peers to find out if some of them has still not ended, and in
that case delay sending an HTTP result.
However, the peer was sending the signal before moving to DELETED state,
and hence smscb_message_fsm would never send the HTTP result until T3
(T_WAIT_DELETE_ACK) would time out after it:
"""
20220629104312596 DCBSP INFO SMSCB-PEER(TTCN-3-44-ttcn3)[0x560b46c1f770]{WAIT_DELETE_ACK}: Received Event DELETE_ACK (cbsp_server_fsm.c:348)
20220629104312596 DCBSP INFO SMSCB(TTCN-3-44)[0x560b46c1f090]{WAIT_DELETE_ACK}: Received Event DELETE_ACK (smscb_peer_fsm.c:423)
20220629104312596 DCBSP INFO SMSCB-PEER(TTCN-3-44-ttcn3)[0x560b46c1f770]{WAIT_DELETE_ACK}: state_chg to DELETED (smscb_peer_fsm.c:424)
20220629104327599 DCBSP INFO SMSCB(TTCN-3-44)[0x560b46c1f090]{WAIT_DELETE_ACK}: Timeout of T3 (fsm.c:317)
20220629104327599 DREST DEBUG rest_it_op_complete(op=0x7fd09c001490) complete (rest_it_op.c:129)
20220629104327599 DCBSP INFO SMSCB(TTCN-3-44)[0x560b46c1f090]{WAIT_DELETE_ACK}: state_chg to DELETED (smscb_message_fsm.c:294)
20220629104327599 DREST DEBUG rest_it_op completed with 0 (HTTP 0) (rest_it_op.c:68)
"""
Change-Id: Idb418728e1242fc5436355ccf73f20b1419e1eb8
---
M src/smscb_peer_fsm.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/96/28496/1
diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c
index 08b0f3f..21f17e6 100644
--- a/src/smscb_peer_fsm.c
+++ b/src/smscb_peer_fsm.c
@@ -419,9 +419,9 @@
/* append results */
msg_peer_append_cbsp_compl(mp, &dec->u.kill_compl.num_compl_list);
msg_peer_append_cbsp_cell(mp, &dec->u.kill_compl.cell_list);
+ osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0);
/* Signal parent fsm about completion */
osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_DELETE_ACK, mp);
- osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0);
break;
case SMSCB_E_CBSP_DELETE_NACK:
dec = data;
@@ -429,9 +429,9 @@
msg_peer_append_cbsp_compl(mp, &dec->u.kill_fail.num_compl_list);
msg_peer_append_cbsp_cell(mp, &dec->u.kill_fail.cell_list);
msg_peer_append_cbsp_fail(mp, &dec->u.kill_fail.fail_list);
+ osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0);
/* Signal parent fsm about completion */
osmo_fsm_inst_dispatch(fi->proc.parent, SMSCB_E_CBSP_DELETE_NACK, mp);
- osmo_fsm_inst_state_chg(fi, SMSCB_S_DELETED, 0, 0);
break;
default:
OSMO_ASSERT(0);
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28496
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: Idb418728e1242fc5436355ccf73f20b1419e1eb8
Gerrit-Change-Number: 28496
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28495 )
Change subject: MGCP_Test: add testcase TC_e1_dlcx_wildcarded
......................................................................
Patch Set 2:
(1 comment)
File mgw/MGCP_Test.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28495/comment/8f68eb94_43e0…
PS2, Line 2454: /* Query a the statsd once to ensure that intermediate results are pulled from the
See my comment on previous patch.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28495
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6cfbd24982d1e72206f8237b2eaea52cdaebf9dc
Gerrit-Change-Number: 28495
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 30 Jun 2022 14:54:55 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28494 )
Change subject: MGCP_Test: fix TC_dlcx_wildcarded
......................................................................
Patch Set 1:
(1 comment)
File mgw/MGCP_Test.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28494/comment/b7744070_3fca…
PS1, Line 1121: /* Query a the statsd once to ensure that intermediate results are pulled from the
Are you sure what you say is correct? IIRC there are no intermediate results at all, statsd are only sent when requested in this setup, tey are only sent on demand when f_statsd_expect is called?
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28494
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I5fe18e433b32c364778b515ed37fcbcf443b3cb3
Gerrit-Change-Number: 28494
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 30 Jun 2022 14:54:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28495
to look at the new patch set (#2).
Change subject: MGCP_Test: add testcase TC_e1_dlcx_wildcarded
......................................................................
MGCP_Test: add testcase TC_e1_dlcx_wildcarded
We are currently testing the behaviour of wildcarded DLCX on the virtual
trunk. Lets run a similar test on the E1 trunk as well.
Change-Id: I6cfbd24982d1e72206f8237b2eaea52cdaebf9dc
Related: OS#5572
---
M mgw/MGCP_Test.ttcn
1 file changed, 64 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/28495/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28495
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I6cfbd24982d1e72206f8237b2eaea52cdaebf9dc
Gerrit-Change-Number: 28495
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28494 )
Change subject: MGCP_Test: fix TC_dlcx_wildcarded
......................................................................
MGCP_Test: fix TC_dlcx_wildcarded
When the final condition of the testcase is verified through statsd,
there may be still (invalid) data from a previous measurement in the
statsd pipeline, querying the stats once before verifying the actual
stats fixes the problem.
Change-Id: I5fe18e433b32c364778b515ed37fcbcf443b3cb3
Related: OS#5572
---
M mgw/MGCP_Test.ttcn
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/28494/1
diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn
index 60f955f..0242db9 100644
--- a/mgw/MGCP_Test.ttcn
+++ b/mgw/MGCP_Test.ttcn
@@ -1118,8 +1118,14 @@
cmd := ts_DLCX(get_next_trans_id(), ep);
mgcp_transceive_mgw(cmd, rtmpl);
- /* The second interval must resturn a result with 0 endpoints in use. */
- f_sleep(1.0)
+ /* Query a the statsd once to ensure that intermediate results are pulled from the
+ * pipeline. The second query (below) will return the actual result. */
+ expect := {
+ { name := "TTCN3.trunk.virtual-0.common.endpoints.used", mtype := "g", min := 0, max := n_endpoints}
+ };
+ f_statsd_expect(expect);
+
+ /* The second query must resturn a result with 0 endpoints in use. */
expect := {
{ name := "TTCN3.trunk.virtual-0.common.endpoints.used", mtype := "g", min := 0, max := 0}
};
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28494
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I5fe18e433b32c364778b515ed37fcbcf443b3cb3
Gerrit-Change-Number: 28494
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: laforge, fixeria, pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28328 )
Change subject: lchan_select: implement dynamic selection mode for assignment
......................................................................
Patch Set 5:
(3 comments)
File src/osmo-bsc/abis_rsl.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/28328/comment/916edc0c_874940a3
PS5, Line 2010: if (lchan_avail_by_type(rqd->bts, GSM_LCHAN_TCH_F, SELECT_FOR_MS_CHAN_REQ, NULL, true)) {
why pass NULL as ctx, isn't there any other talloc context available to hang this on that makes more sense? (same below a lot of times)
File src/osmo-bsc/lchan_select.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/28328/comment/382e7745_128d00e4
PS2, Line 231: qsort(&trx_list[0], bts->num_trx, sizeof(trx), &qsort_func);
> I can find arguments in favor of both ways, I don't see a clear advantage of either over the other. […]
I guess it could be refactored to pass qsort_func to populate_ts_list, instead of passing sort_by_trx_power. But I don't have a strong opinion here, I'd be fine with merging this part as-is.
File src/osmo-bsc/lchan_select.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/28328/comment/8a3ed6c5_ed1a8d27
PS5, Line 271: } while (0)
why add this instead of using a separate log category where one could enable/disable logging with the usual vty commands?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28328
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I1b7a0d706976b73cc5c30a8714b830811addfe8d
Gerrit-Change-Number: 28328
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 30 Jun 2022 14:39:42 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28493 )
Change subject: Configure libosmocore logging system as multithread
......................................................................
Configure libosmocore logging system as multithread
OsmoCBC uses libulfius, which creates its own thread(s).
Hence, we must set up osmocom logging system appropiately so that
relevant stuff is protected by locks.
Related: OS#5598
Change-Id: Ic06edc19d22b90e2b6b7de3a25d62cda5001f46e
---
M src/cbc_main.c
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/93/28493/1
diff --git a/src/cbc_main.c b/src/cbc_main.c
index 140d047..4b64c91 100644
--- a/src/cbc_main.c
+++ b/src/cbc_main.c
@@ -212,6 +212,7 @@
tall_rest_ctx = talloc_named_const(tall_cbc_ctx, 0, "REST");
msgb_talloc_ctx_init(tall_cbc_ctx, 0);
osmo_init_logging2(tall_cbc_ctx, &log_info);
+ log_enable_multithread();
osmo_stats_init(tall_cbc_ctx);
vty_init(&vty_info);
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28493
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: Ic06edc19d22b90e2b6b7de3a25d62cda5001f46e
Gerrit-Change-Number: 28493
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: fixeria, pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28327 )
Change subject: lchan_select: allow different alloc order for assignment and handover
......................................................................
Patch Set 2: Code-Review+1
(1 comment)
File src/osmo-bsc/bts_vty.c:
https://gerrit.osmocom.org/c/osmo-bsc/+/28327/comment/23e3a416_fb8cdfea
PS2, Line 4246: vty_out(vty, " channel allocator mode chan-req %s%s",
possibly output one set-all line instead if it is the same for all three?
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28327
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I3ae73b36ee9433cc768376b56f0765e5f416162f
Gerrit-Change-Number: 28327
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 30 Jun 2022 14:02:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28491 )
Change subject: coverity/prepare_source: add SRC_SKIP_FETCH/CLEAN
......................................................................
Patch Set 1:
(1 comment)
File coverity/prepare_source_Osmocom.sh:
https://gerrit.osmocom.org/c/osmo-ci/+/28491/comment/650a3323_e56d6021
PS1, Line 41: git -C "$proj" clean -ffxd
> I don't really like the idea of doing 2 different things based on some external "use case". […]
Okay I see your point, changed it to only behave differently if environment variables are set, and set them in the local test script.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28491
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id6d3cdabb776435df36c0145d93e514693062fca
Gerrit-Change-Number: 28491
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: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 30 Jun 2022 13:33:05 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: osmith.
Hello Jenkins Builder, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/28492
to look at the new patch set (#2).
Change subject: coverity/local_test.sh: new file
......................................................................
coverity/local_test.sh: new file
Add the script I've used to locally reproduce the build failure and fix
it.
Change-Id: I12241499a0669559bc40eb3e76f967a7c6a2dc70
---
M coverity/jenkins.sh
A coverity/local_test.sh
2 files changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/92/28492/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28492
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I12241499a0669559bc40eb3e76f967a7c6a2dc70
Gerrit-Change-Number: 28492
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith.
Hello Jenkins Builder, pespin, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/28491
to look at the new patch set (#2).
Change subject: coverity/prepare_source: add SRC_SKIP_FETCH/CLEAN
......................................................................
coverity/prepare_source: add SRC_SKIP_FETCH/CLEAN
When running these scripts locally while developing, it's more useful to
not fetch the sources and clean the git repository instead. Add
environment variables that allow doing this.
Change-Id: Id6d3cdabb776435df36c0145d93e514693062fca
---
M coverity/prepare_source_Osmocom.sh
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/28491/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28491
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id6d3cdabb776435df36c0145d93e514693062fca
Gerrit-Change-Number: 28491
Gerrit-PatchSet: 2
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-MessageType: newpatchset
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28491 )
Change subject: coverity/prepare_source: clean existing git dirs
......................................................................
Patch Set 1:
(1 comment)
File coverity/prepare_source_Osmocom.sh:
https://gerrit.osmocom.org/c/osmo-ci/+/28491/comment/01ca120c_bcc2337e
PS1, Line 41: git -C "$proj" clean -ffxd
> I think there are two use cases: […]
I don't really like the idea of doing 2 different things based on some external "use case".
If you want fast iterations at a specific time, then better disable it manually for the time you do it. I don't think it makes sense to have one path updating the content while the other doesn't, this will end up in strange behaviors which are difficult to follow.
If other people disagree with me, then go on, +2 and merge.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28491
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id6d3cdabb776435df36c0145d93e514693062fca
Gerrit-Change-Number: 28491
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-Comment-Date: Thu, 30 Jun 2022 12:59:16 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(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-ci/+/28491 )
Change subject: coverity/prepare_source: clean existing git dirs
......................................................................
Patch Set 1:
(1 comment)
File coverity/prepare_source_Osmocom.sh:
https://gerrit.osmocom.org/c/osmo-ci/+/28491/comment/63b475bb_3fe1783b
PS1, Line 41: git -C "$proj" clean -ffxd
> this should also pull latest master, since that's what git clone is doing below.
I think there are two use cases:
1. jenkins, which removes the source directories and does a fresh clone
2. development of these scripts where we want fast iterations. running git fetch/pull on each repo just slows it down.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28491
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id6d3cdabb776435df36c0145d93e514693062fca
Gerrit-Change-Number: 28491
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: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 30 Jun 2022 12:55:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28489 )
Change subject: coverity/build_Osmocom.sh: don't do check for all
......................................................................
coverity/build_Osmocom.sh: don't do check for all
'make check' does not pass for asn1c, it fails with the following. I
looked into it and the cause is not obvious to me, so in order to make
the jenkins job pass again I've changed it back to just run 'make'
instead.
Fix for:
...
fatal: making test-suite.log: failed to create ../tests/98-attribute-class-OK.asn1.log
fatal: making test-suite.log: failed to create ../tests/99-class-sample-OK.asn1.trs
fatal: making test-suite.log: failed to create ../tests/99-class-sample-OK.asn1.log
Makefile:735: recipe for target 'test-suite.log' failed
make[3]: *** [test-suite.log] Error 1
make[3]: Leaving directory '/home/osmocom-build/osmo-ci/coverity/source-Osmocom/asn1c/libasn1fix'
Makefile:841: recipe for target 'check-TESTS' failed
Disable 'make check' for libusrp too as it also didn't pass:
Making check in usrp2
make[4]: Entering directory '/tmp/coverity/source-Osmocom/libusrp/firmware/src/usrp2'
test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' .
test -f ../common/`basename 'eeprom_boot.a51'` -o \
\! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \
|| ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'`
sdas8051 -plosgff `basename 'eeprom_boot.a51'`
sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \
-c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c
test -f `basename '_startup.a51'` || ln -s '_startup.a51' .
test -f ../common/`basename '_startup.a51'` -o \
\! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \
|| ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'`
sdas8051 -plosgff `basename '_startup.a51'`
make[4]: *** No rule to make target '../../lib/libfx2.lib', needed by 'eeprom_boot.ihx'. Stop.
All other 'make check' calls do work as expected, the build script runs
through again with this patch.
Fixes: bf84ba9f ("coverity/build_Osmocom.sh: run 'make check' in do_build()")
Change-Id: I6b9eb8e73c51d925897579fb51bc0a1e86e77270
---
M coverity/build_Osmocom.sh
1 file changed, 17 insertions(+), 3 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh
index fe9806c..ec764be 100755
--- a/coverity/build_Osmocom.sh
+++ b/coverity/build_Osmocom.sh
@@ -5,6 +5,7 @@
base_dir="$PWD"
src_dir="$base_dir/source-Osmocom"
prefix="$base_dir/install-Osmocom"
+check="check"
install -d "$prefix"
@@ -18,10 +19,16 @@
--disable-doxygen \
$*
- make $PARALLEL_MAKE check
+ make $PARALLEL_MAKE $check
make install
}
+do_build_no_check() {
+ check=""
+ do_build "$@"
+ check="check"
+}
+
build_default() {
pushd $1
shift
@@ -29,6 +36,13 @@
popd
}
+build_no_check() {
+ pushd $1
+ shift
+ do_build_no_check $*
+ popd
+}
+
build_layer1api() {
pushd layer1-api
install -d "$prefix/include/sysmocom/femtobts/"
@@ -69,10 +83,10 @@
rm -rf "$prefix"
build_layer1api
-build_default asn1c
+build_no_check asn1c
build_default libosmocore
build_libasn1c
-build_libusrp
+build_no_check libusrp
build_default libosmo-abis
build_default libosmo-netif
build_default libosmo-sccp
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28489
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6b9eb8e73c51d925897579fb51bc0a1e86e77270
Gerrit-Change-Number: 28489
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
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28490 )
Change subject: coverity/prepare_source: fix running twice
......................................................................
coverity/prepare_source: fix running twice
Don't attempt to clone layer1-api if it exists already. Jenkins deletes
the sources for every run, but for development it is useful to be able
to run this script multiple times without getting errors.
Change-Id: I17bd76a5ff6abafd4bd0189073930f45de20afe8
---
M coverity/prepare_source_Osmocom.sh
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh
index ab8b2bd..09608eb 100755
--- a/coverity/prepare_source_Osmocom.sh
+++ b/coverity/prepare_source_Osmocom.sh
@@ -44,4 +44,6 @@
fi
done
-git clone https://git.sysmocom.de/sysmo-bts/layer1-api
+if ! [ -d layer1-api ]; then
+ git clone https://git.sysmocom.de/sysmo-bts/layer1-api
+fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28490
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I17bd76a5ff6abafd4bd0189073930f45de20afe8
Gerrit-Change-Number: 28490
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: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28489 )
Change subject: coverity/build_Osmocom.sh: don't do check for all
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28489
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6b9eb8e73c51d925897579fb51bc0a1e86e77270
Gerrit-Change-Number: 28489
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-Comment-Date: Thu, 30 Jun 2022 12:45:12 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: dexter.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28486 )
Change subject: tlv_parser: initialize output values
......................................................................
Patch Set 1: Code-Review-1
(1 comment)
Patchset:
PS1:
I don't think that's the problem coverity is notifying, since it tracks conditional paths based on return values.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28486
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I87570ece10fbf64f3a57b34d84f8c843871f0db1
Gerrit-Change-Number: 28486
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 30 Jun 2022 12:44:10 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28489 )
Change subject: coverity/build_Osmocom.sh: don't do check for all
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28489
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6b9eb8e73c51d925897579fb51bc0a1e86e77270
Gerrit-Change-Number: 28489
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 30 Jun 2022 10:39:31 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28491 )
Change subject: coverity/prepare_source: clean existing git dirs
......................................................................
coverity/prepare_source: clean existing git dirs
Clean git dirs if they exist already instead of fetching and reset to
master. It is faster and more useful during development. Jenkins doesn't
run this code path, it deletes all source directories before running
this script.
Change-Id: Id6d3cdabb776435df36c0145d93e514693062fca
---
M coverity/prepare_source_Osmocom.sh
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/91/28491/1
diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh
index 09608eb..d017989 100755
--- a/coverity/prepare_source_Osmocom.sh
+++ b/coverity/prepare_source_Osmocom.sh
@@ -38,7 +38,7 @@
; do
if [ -d $proj ]; then
- (cd $proj && git fetch && git checkout -f -B master origin/master)
+ git -C "$proj" clean -ffxd
else
git clone git://git.osmocom.org/$proj
fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28491
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Id6d3cdabb776435df36c0145d93e514693062fca
Gerrit-Change-Number: 28491
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28492 )
Change subject: coverity/local_test.sh: new file
......................................................................
coverity/local_test.sh: new file
Add the script I've used to locally reproduce the build failure and fix
it.
Change-Id: I12241499a0669559bc40eb3e76f967a7c6a2dc70
---
M coverity/jenkins.sh
A coverity/local_test.sh
2 files changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/92/28492/1
diff --git a/coverity/jenkins.sh b/coverity/jenkins.sh
index 0ae7fd7..b02b82e 100755
--- a/coverity/jenkins.sh
+++ b/coverity/jenkins.sh
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
+# Use 'local_test.sh' during development
set -e -x
diff --git a/coverity/local_test.sh b/coverity/local_test.sh
new file mode 100755
index 0000000..10b4583
--- /dev/null
+++ b/coverity/local_test.sh
@@ -0,0 +1,11 @@
+#!/bin/sh -ex
+# Use this script for local testing of the prepare source and build scripts
+SCRIPT_DIR="$(dirname "$(realpath "$0")")"
+
+mkdir -p /tmp/coverity
+cp "$SCRIPT_DIR"/* /tmp/coverity
+
+cd /tmp/coverity
+
+./prepare_source_Osmocom.sh
+./build_Osmocom.sh
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28492
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I12241499a0669559bc40eb3e76f967a7c6a2dc70
Gerrit-Change-Number: 28492
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28489 )
Change subject: coverity/build_Osmocom.sh: don't do check for all
......................................................................
coverity/build_Osmocom.sh: don't do check for all
'make check' does not pass for asn1c, it fails with the following. I
looked into it and the cause is not obvious to me, so in order to make
the jenkins job pass again I've changed it back to just run 'make'
instead.
Fix for:
...
fatal: making test-suite.log: failed to create ../tests/98-attribute-class-OK.asn1.log
fatal: making test-suite.log: failed to create ../tests/99-class-sample-OK.asn1.trs
fatal: making test-suite.log: failed to create ../tests/99-class-sample-OK.asn1.log
Makefile:735: recipe for target 'test-suite.log' failed
make[3]: *** [test-suite.log] Error 1
make[3]: Leaving directory '/home/osmocom-build/osmo-ci/coverity/source-Osmocom/asn1c/libasn1fix'
Makefile:841: recipe for target 'check-TESTS' failed
Disable 'make check' for libusrp too as it also didn't pass:
Making check in usrp2
make[4]: Entering directory '/tmp/coverity/source-Osmocom/libusrp/firmware/src/usrp2'
test -f `basename 'eeprom_boot.a51'` || ln -s 'eeprom_boot.a51' .
test -f ../common/`basename 'eeprom_boot.a51'` -o \
\! -f `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` \
|| ln -s `dirname 'eeprom_boot.a51'`/../common/`basename 'eeprom_boot.a51'` ../common/`basename 'eeprom_boot.a51'`
sdas8051 -plosgff `basename 'eeprom_boot.a51'`
sdcc -mmcs51 --no-xinit-opt -I../../../firmware/include -I../../../firmware/src/usrp2 -I../../../firmware/src/common -I../../../firmware/src/common -DHAVE_USRP2 \
-c -o eeprom_init.rel `test -f 'eeprom_init.c' || echo './'`eeprom_init.c
test -f `basename '_startup.a51'` || ln -s '_startup.a51' .
test -f ../common/`basename '_startup.a51'` -o \
\! -f `dirname '_startup.a51'`/../common/`basename '_startup.a51'` \
|| ln -s `dirname '_startup.a51'`/../common/`basename '_startup.a51'` ../common/`basename '_startup.a51'`
sdas8051 -plosgff `basename '_startup.a51'`
make[4]: *** No rule to make target '../../lib/libfx2.lib', needed by 'eeprom_boot.ihx'. Stop.
All other 'make check' calls do work as expected, the build script runs
through again with this patch.
Fixes: bf84ba9f ("coverity/build_Osmocom.sh: run 'make check' in do_build()")
Change-Id: I6b9eb8e73c51d925897579fb51bc0a1e86e77270
---
M coverity/build_Osmocom.sh
1 file changed, 17 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/89/28489/1
diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh
index fe9806c..ec764be 100755
--- a/coverity/build_Osmocom.sh
+++ b/coverity/build_Osmocom.sh
@@ -5,6 +5,7 @@
base_dir="$PWD"
src_dir="$base_dir/source-Osmocom"
prefix="$base_dir/install-Osmocom"
+check="check"
install -d "$prefix"
@@ -18,10 +19,16 @@
--disable-doxygen \
$*
- make $PARALLEL_MAKE check
+ make $PARALLEL_MAKE $check
make install
}
+do_build_no_check() {
+ check=""
+ do_build "$@"
+ check="check"
+}
+
build_default() {
pushd $1
shift
@@ -29,6 +36,13 @@
popd
}
+build_no_check() {
+ pushd $1
+ shift
+ do_build_no_check $*
+ popd
+}
+
build_layer1api() {
pushd layer1-api
install -d "$prefix/include/sysmocom/femtobts/"
@@ -69,10 +83,10 @@
rm -rf "$prefix"
build_layer1api
-build_default asn1c
+build_no_check asn1c
build_default libosmocore
build_libasn1c
-build_libusrp
+build_no_check libusrp
build_default libosmo-abis
build_default libosmo-netif
build_default libosmo-sccp
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28489
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6b9eb8e73c51d925897579fb51bc0a1e86e77270
Gerrit-Change-Number: 28489
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28490 )
Change subject: coverity/prepare_source: fix running twice
......................................................................
coverity/prepare_source: fix running twice
Don't attempt to clone layer1-api if it exists already. Jenkins deletes
the sources for every run, but for development it is useful to be able
to run this script multiple times without getting errors.
Change-Id: I17bd76a5ff6abafd4bd0189073930f45de20afe8
---
M coverity/prepare_source_Osmocom.sh
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/90/28490/1
diff --git a/coverity/prepare_source_Osmocom.sh b/coverity/prepare_source_Osmocom.sh
index ab8b2bd..09608eb 100755
--- a/coverity/prepare_source_Osmocom.sh
+++ b/coverity/prepare_source_Osmocom.sh
@@ -44,4 +44,6 @@
fi
done
-git clone https://git.sysmocom.de/sysmo-bts/layer1-api
+if ! [ -d layer1-api ]; then
+ git clone https://git.sysmocom.de/sysmo-bts/layer1-api
+fi
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28490
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I17bd76a5ff6abafd4bd0189073930f45de20afe8
Gerrit-Change-Number: 28490
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/28487
to look at the new patch set (#2).
Change subject: jobs: ttcn3-testsuites: Enable hnodeb,hnbgw,sccp,gbproxy 'latest' after new project releases
......................................................................
jobs: ttcn3-testsuites: Enable hnodeb,hnbgw,sccp,gbproxy 'latest' after new project releases
These two projects have been released recently as part of Osmocom CNI
202206. Let's enable testing them since version in latest is good enough
for testing.
Change-Id: I1587e8400eff2d8b1ec26ab2fff1fbfa772fe8f8
---
M jobs/ttcn3-testsuites.yml
1 file changed, 16 insertions(+), 16 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/87/28487/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28487
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I1587e8400eff2d8b1ec26ab2fff1fbfa772fe8f8
Gerrit-Change-Number: 28487
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/28487 )
Change subject: jobs: ttcn3-testsuites: Enable hnodeb,hnbgw 'latest' after new project releases
......................................................................
jobs: ttcn3-testsuites: Enable hnodeb,hnbgw 'latest' after new project releases
These two projects have been released recently as part of Osmocom CNI
202206. Let's enable testing them since version in latest is good enough
for testing.
Change-Id: I1587e8400eff2d8b1ec26ab2fff1fbfa772fe8f8
---
M jobs/ttcn3-testsuites.yml
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/87/28487/1
diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index d4b4ec7..1110403 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -229,7 +229,6 @@
- ttcn3-hnodeb-test-latest:
blocking: "^(ttcn3|TTCN3-.*)-hnodeb-test.*"
timer: 40 12 * * *
- disabled: true
- ttcn3-upf-test-latest:
blocking: "^(ttcn3|TTCN3-.*)-upf-test.*"
timer: 00 13 * * *
@@ -237,8 +236,6 @@
- ttcn3-hnbgw-test-latest:
blocking: "^(ttcn3|TTCN3-.*)-hnbgw-test.*"
timer: 40 13 * * *
- disabled: true
-
# Jobs below use uppercase TTCN3-$DISTRO, so they get listed separately from the ttcn3-* (debian-stretch) jobs
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28487
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I1587e8400eff2d8b1ec26ab2fff1fbfa772fe8f8
Gerrit-Change-Number: 28487
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28486 )
Change subject: tlv_parser: initialize output values
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
I am not sure if this make sense at all, what I am trying to fix here is:
*** CID 273004: (TAINTED_SCALAR)
/source-Osmocom/osmo-bsc-nat/src/osmo-bsc-nat/bssap_conn.c: 56 in bssmap_replace_ie_aoip_transp_addr()
50 return rv;
51 }
52
53 if (tag == GSM0808_IE_AOIP_TRASP_ADDR)
54 rc = gsm0808_enc_aoip_trasp_addr(msg_new, ss);
55 else
>>> CID 273004: (TAINTED_SCALAR)
>>> Passing tainted expression "len" to "tlv_encode_one", which uses it as an offset.
56 rc = tlv_encode_one(msg_new, def->def[tag].type, tag, len, val);
57
58 if (rc < 0) {
59 LOGP(DMAIN, LOGL_ERROR, "Failed to encode tag %d into copy of bssmap msg\n", tag);
60 msgb_free(msg_new);
61 return rc;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28486
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I87570ece10fbf64f3a57b34d84f8c843871f0db1
Gerrit-Change-Number: 28486
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Thu, 30 Jun 2022 08:41:20 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28486 )
Change subject: tlv_parser: initialize output values
......................................................................
tlv_parser: initialize output values
When the function tlv_parse_one exits early, the output parameters may
not be initialized. This is no problem since the return code will inform
the caller that the parsing of the TLV IE failed. However, coverity
seems to report a TAINTED_SCALAR problem anyway.
Change-Id: I87570ece10fbf64f3a57b34d84f8c843871f0db1
Related: CID#273004
---
M src/gsm/tlv_parser.c
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/28486/1
diff --git a/src/gsm/tlv_parser.c b/src/gsm/tlv_parser.c
index c5aac97..069f1a0 100644
--- a/src/gsm/tlv_parser.c
+++ b/src/gsm/tlv_parser.c
@@ -234,6 +234,12 @@
uint8_t tag;
int len; /* number of bytes consumed by TLV entry */
+ /* Make output variables are initialized
+ * (fixes CID 273004, false positive) */
+ *o_tag = 0x00;
+ *o_len = 0;
+ *o_val = NULL;
+
if (buf_len < 1)
return OSMO_TLVP_ERR_OFS_BEYOND_BUFFER;
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28486
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I87570ece10fbf64f3a57b34d84f8c843871f0db1
Gerrit-Change-Number: 28486
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newchange