December 2022 - gerrit-log - lists.osmocom.org

Change in libosmo-pfcp[master]: fix coding of Network Instance IE

by laforge

Attention is currently required from: neels, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/30406 ) Change subject: fix coding of Network Instance IE ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: I also agree we should first check if osmo_apn_{to,from}_str can be used. If not, then I'd consider extending/enhancing the libosmocore code rather than having a disjunct code base dealing with DNS/APN name encoding in osmo-upf -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/30406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I9d67464ef0f92b0512cfd6e48d203f8828a82a19 Gerrit-Change-Number: 30406 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Dec 2022 11:23:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in libosmo-pfcp[master]: pfcp coding errmsgs: drop extra newlines

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/30405 ) Change subject: pfcp coding errmsgs: drop extra newlines ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/30405 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I4eea1efc9bd67676b6202e50d41974b2717a2511 Gerrit-Change-Number: 30405 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Dec 2022 11:21:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in libosmo-pfcp[master]: tweak comment in pfcp_ies_custom.c

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/30404 ) Change subject: tweak comment in pfcp_ies_custom.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/30404 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I1530939cc63369668d2f3e5a126912713c06d0c1 Gerrit-Change-Number: 30404 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Dec 2022 11:21:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: gsm_forward_mncc(): call mncc_sock_from_cc() directly

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30400 ) Change subject: mobile: gsm_forward_mncc(): call mncc_sock_from_cc() directly ...................................................................... mobile: gsm_forward_mncc(): call mncc_sock_from_cc() directly This way we can avoid allocating another msgb and enqueue the given msgb directly to the write queue of the MNCC socket. Change-Id: I29305866e61a0bc3bd082108af6a9ba8ff86bcf2 Related: OS#5599 --- M src/host/layer23/src/mobile/voice.c 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified msuraev: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 5833cad..58c62d6 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -51,9 +51,8 @@ } /* distribute and then free */ - if (ms->mncc_entity.mncc_recv && ms->mncc_entity.ref) { - ms->mncc_entity.mncc_recv(ms, mncc->msg_type, mncc); - } + if (ms->mncc_entity.sock_state && ms->mncc_entity.ref) + return mncc_sock_from_cc(ms->mncc_entity.sock_state, msg); exit_free: msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I29305866e61a0bc3bd082108af6a9ba8ff86bcf2 Gerrit-Change-Number: 30400 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: gsm_forward_mncc(): properly mark TCH/H frames

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30401 ) Change subject: mobile: gsm_forward_mncc(): properly mark TCH/H frames ...................................................................... mobile: gsm_forward_mncc(): properly mark TCH/H frames Change-Id: Id3f459bc767ebf31469287fa672893239c5977d9 Related: OS#5599 --- M src/host/layer23/src/mobile/voice.c 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 58c62d6..cb1718f 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -20,6 +20,8 @@ #include <osmocom/core/msgb.h> #include <osmocom/codec/codec.h> +#include <osmocom/gsm/protocol/gsm_08_58.h> + #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/mobile/mncc.h> @@ -37,14 +39,20 @@ msgb_push(msg, sizeof(struct gsm_data_frame)); mncc->callref = ms->mncc_entity.ref; - /* FIXME: FR, EFR only! */ switch (ms->rrlayer.cd_now.mode) { case GSM48_CMODE_SPEECH_V1: - mncc->msg_type = GSM_TCHF_FRAME; + { + const uint8_t cbits = ms->rrlayer.cd_now.chan_nr >> 3; + if (cbits == ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs) + mncc->msg_type = GSM_TCHF_FRAME; + else + mncc->msg_type = GSM_TCHH_FRAME; break; + } case GSM48_CMODE_SPEECH_EFR: mncc->msg_type = GSM_TCHF_FRAME_EFR; break; + case GSM48_CMODE_SPEECH_AMR: /* TODO: no AMR support yet */ default: /* TODO: print error message here */ goto exit_free; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id3f459bc767ebf31469287fa672893239c5977d9 Gerrit-Change-Number: 30401 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: integrate GAPK based audio (voice) I/O support

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30337 ) Change subject: mobile: integrate GAPK based audio (voice) I/O support ...................................................................... mobile: integrate GAPK based audio (voice) I/O support This change introduces a new feature to the mobile application - audio I/O support, which allows the user to speak right from the host side running mobile through its ordinary mic and speakers. The audio I/O is based on libosmogapk [1][2], which in its turn uses the ALSA sound system for the playback and capture. This is a new optional dependency of mobile, which is automatically picked up if available during the build configuration. Whether to depend on it or not can be controlled using '--with-gapk-io'. The API offered by libosmogapk implies to use the processing chains, which generally consist of a source block, several processing blocks, and a sink block. The mobile app implements the following chains: - 'pq_audio_source' (voice capture -> frame encoding), - 'pq_audio_sink' (frame decoding -> voice playback). both taking/storing TCH frames from/to the following two buffers: - 'tch_fb_ul' - a buffer for to be played DL TCH frames, - 'tch_fb_dl' - a buffer for encoded UL TCH frames. The buffers are served by a new function gapk_io_dequeue(). [1] https://gitea.osmocom.org/osmocom/gapk/ [1] https://osmocom.org/projects/gapk Change-Id: Ib86b0746606c191573cc773f01172afbb52f33a9 Related: OS#5599 --- M contrib/jenkins.sh M doc/examples/mobile/default.cfg M doc/examples/mobile/multi_ms.cfg M src/host/layer23/configure.ac M src/host/layer23/include/osmocom/bb/common/logging.h M src/host/layer23/include/osmocom/bb/common/osmocom_data.h M src/host/layer23/include/osmocom/bb/mobile/Makefile.am A src/host/layer23/include/osmocom/bb/mobile/gapk_io.h M src/host/layer23/include/osmocom/bb/mobile/settings.h M src/host/layer23/src/common/logging.c M src/host/layer23/src/mobile/Makefile.am M src/host/layer23/src/mobile/app_mobile.c A src/host/layer23/src/mobile/gapk_io.c M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/main.c M src/host/layer23/src/mobile/settings.c M src/host/layer23/src/mobile/voice.c M src/host/layer23/src/mobile/vty_interface.c 18 files changed, 761 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve Hoernchen: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index fafbdfb..2758f4e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -17,14 +17,15 @@ mkdir "$deps" || true -osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false - # TODO: ask whether fail is expected, because osmocom-bb build succeeds? #"$deps"/libosmocore/contrib/verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$inst/lib" +osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false +osmo-build-dep.sh gapk + set +x echo echo diff --git a/doc/examples/mobile/default.cfg b/doc/examples/mobile/default.cfg index e24e07f..841a356 100644 --- a/doc/examples/mobile/default.cfg +++ b/doc/examples/mobile/default.cfg @@ -63,4 +63,6 @@ rplmn 001 01 audio io-handler none + alsa-output-dev default + alsa-input-dev default no shutdown diff --git a/doc/examples/mobile/multi_ms.cfg b/doc/examples/mobile/multi_ms.cfg index 86a9840..c7d4097 100644 --- a/doc/examples/mobile/multi_ms.cfg +++ b/doc/examples/mobile/multi_ms.cfg @@ -63,6 +63,8 @@ rplmn 001 01 audio io-handler none + alsa-output-dev default + alsa-input-dev default no shutdown ! ms two @@ -117,4 +119,6 @@ rplmn 001 01 audio io-handler none + alsa-output-dev default + alsa-input-dev default no shutdown diff --git a/src/host/layer23/configure.ac b/src/host/layer23/configure.ac index 50cb8ca..9c11dbd 100644 --- a/src/host/layer23/configure.ac +++ b/src/host/layer23/configure.ac @@ -55,6 +55,11 @@ [Enable LUA scripting support @<:@default=check@:>@]) ]) +AC_ARG_WITH([gapk_io], [ + AS_HELP_STRING([--with-gapk-io], + [Enable GAPK I/O support @<:@default=check@:>@]) +]) + found_lua53=no AS_IF([test "x$with_lua53" != "xno"], [ PKG_CHECK_MODULES(LIBLUA, lua53, [found_lua53=yes], [found_lua53=no]) @@ -64,6 +69,15 @@ ]) AM_CONDITIONAL([BUILD_LUA], test "x$found_lua53" = "xyes") +found_gapk=no +AS_IF([test "x$with_gapk_io" != "xno"], [ + PKG_CHECK_MODULES(LIBOSMOGAPK, libosmogapk, [found_gapk=yes], [found_gapk=no]) + AS_IF([test "x$with_gapk_io" = "xyes" -a "x$found_gapk" = "xno"], [ + AC_MSG_ERROR([GAPK I/O support requested but pkg-config is unable to find it]) + ]) +]) +AM_CONDITIONAL([BUILD_GAPK], test "x$found_gapk" = "xyes") + dnl checks for header files AC_HEADER_STDC diff --git a/src/host/layer23/include/osmocom/bb/common/logging.h b/src/host/layer23/include/osmocom/bb/common/logging.h index bf6e6aa..e968528 100644 --- a/src/host/layer23/include/osmocom/bb/common/logging.h +++ b/src/host/layer23/include/osmocom/bb/common/logging.h @@ -25,6 +25,7 @@ DMOB, DPRIM, DLUA, + DGAPK, }; extern const struct log_info log_info; diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h index 14e594c..a8af1e8 100644 --- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h +++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h @@ -6,6 +6,7 @@ #include <osmocom/core/write_queue.h> struct osmocom_ms; +struct gapk_io_state; /* FIXME no 'mobile' specific stuff should be here */ #include <osmocom/bb/mobile/support.h> @@ -94,6 +95,9 @@ struct osmomncc_entity mncc_entity; struct llist_head trans_list; + /* Audio I/O */ + struct gapk_io_state *gapk_io; + void *lua_state; int lua_cb_ref; char *lua_script; diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am index 623964f..978a701 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am +++ b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am @@ -1,4 +1,4 @@ noinst_HEADERS = gsm322.h gsm480_ss.h gsm411_sms.h gsm48_cc.h gsm48_mm.h \ gsm48_rr.h mncc.h settings.h subscriber.h support.h \ transaction.h vty.h mncc_sock.h mncc_ms.h primitives.h \ - app_mobile.h voice.h + app_mobile.h voice.h gapk_io.h diff --git a/src/host/layer23/include/osmocom/bb/mobile/gapk_io.h b/src/host/layer23/include/osmocom/bb/mobile/gapk_io.h new file mode 100644 index 0000000..3a02e64 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/mobile/gapk_io.h @@ -0,0 +1,43 @@ +#pragma once + +#ifdef WITH_GAPK_IO + +#include <stdint.h> + +#include <osmocom/gapk/procqueue.h> +#include <osmocom/gapk/codecs.h> + +#define GAPK_ULDL_QUEUE_LIMIT 8 + +/* Forward declarations */ +struct osmocom_ms; +struct msgb; + +struct gapk_io_state { + /* src/alsa -> proc/codec -> sink/tch_fb */ + struct osmo_gapk_pq *pq_source; + /* src/tch_fb -> proc/codec -> sink/alsa */ + struct osmo_gapk_pq *pq_sink; + + /* Description of currently used codec / format */ + const struct osmo_gapk_format_desc *phy_fmt_desc; + const struct osmo_gapk_codec_desc *codec_desc; + + /* DL TCH frame buffer (received, to be played) */ + struct llist_head tch_dl_fb; + unsigned int tch_dl_fb_len; + /* UL TCH frame buffer (captured, to be sent) */ + struct llist_head tch_ul_fb; + unsigned int tch_ul_fb_len; +}; + +void gapk_io_init(void); + +int gapk_io_init_ms(struct osmocom_ms *ms, enum osmo_gapk_codec_type codec); +int gapk_io_init_ms_chan(struct osmocom_ms *ms, uint8_t ch_type, uint8_t ch_mode); +int gapk_io_clean_up_ms(struct osmocom_ms *ms); + +void gapk_io_enqueue_dl(struct gapk_io_state *state, struct msgb *msg); +int gapk_io_serve_ms(struct osmocom_ms *ms); + +#endif /* WITH_GAPK_IO */ diff --git a/src/host/layer23/include/osmocom/bb/mobile/settings.h b/src/host/layer23/include/osmocom/bb/mobile/settings.h index 27b9f5a..2800fea 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/settings.h +++ b/src/host/layer23/include/osmocom/bb/mobile/settings.h @@ -17,6 +17,8 @@ enum audio_io_handler { /* No handler, drop frames */ AUDIO_IOH_NONE = 0, + /* libosmo-gapk based handler */ + AUDIO_IOH_GAPK, /* L1 PHY (e.g. Calypso DSP) */ AUDIO_IOH_L1PHY, /* External MNCC app (via MNCC socket) */ @@ -31,6 +33,8 @@ struct audio_settings { enum audio_io_handler io_handler; + char alsa_output_dev[128]; + char alsa_input_dev[128]; }; struct gsm_settings { diff --git a/src/host/layer23/src/common/logging.c b/src/host/layer23/src/common/logging.c index 96decf9..56f0322 100644 --- a/src/host/layer23/src/common/logging.c +++ b/src/host/layer23/src/common/logging.c @@ -141,6 +141,12 @@ .color = "\033[1;32m", .enabled = 1, .loglevel = LOGL_DEBUG, }, + [DGAPK] = { + .name = "DGAPK", + .description = "GAPK audio", + .color = "\033[0;36m", + .enabled = 1, .loglevel = LOGL_DEBUG, + }, }; const struct log_info log_info = { diff --git a/src/host/layer23/src/mobile/Makefile.am b/src/host/layer23/src/mobile/Makefile.am index 3db27b7..b7b25e3 100644 --- a/src/host/layer23/src/mobile/Makefile.am +++ b/src/host/layer23/src/mobile/Makefile.am @@ -9,6 +9,7 @@ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOCODEC_CFLAGS) \ + $(LIBOSMOGAPK_CFLAGS) \ $(LIBGPS_CFLAGS) \ $(LIBLUA_CFLAGS) \ $(NULL) @@ -43,6 +44,7 @@ $(LIBOSMOVTY_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCODEC_LIBS) \ + $(LIBOSMOGAPK_LIBS) \ $(LIBGPS_LIBS) \ $(LIBLUA_LIBS) \ $(NULL) @@ -54,3 +56,9 @@ else libmobile_a_SOURCES += script_nolua.c endif + +# GAPK I/O support +if BUILD_GAPK +AM_CPPFLAGS += -DWITH_GAPK_IO=1 +libmobile_a_SOURCES += gapk_io.c +endif diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index dd67e70..e59ecb9 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -33,6 +33,7 @@ #include <osmocom/bb/mobile/app_mobile.h> #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/voice.h> +#include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/primitives.h> #include <osmocom/bb/common/sap_interface.h> @@ -72,6 +73,10 @@ w |= gsm322_cs_dequeue(ms); w |= gsm_sim_job_dequeue(ms); w |= mncc_dequeue(ms); +#ifdef WITH_GAPK_IO + if (ms->gapk_io != NULL) + w |= gapk_io_serve_ms(ms); +#endif if (w) work = 1; } while (w); @@ -156,6 +161,12 @@ return -EBUSY; } +#ifdef WITH_GAPK_IO + /* Clean up GAPK state, if preset */ + if (ms->gapk_io != NULL) + gapk_io_clean_up_ms(ms); +#endif + gsm322_exit(ms); gsm48_mm_exit(ms); gsm48_rr_exit(ms); @@ -448,6 +459,11 @@ osmo_gps_init(); +#ifdef WITH_GAPK_IO + /* Init GAPK audio I/O */ + gapk_io_init(); +#endif + vty_info.tall_ctx = l23_ctx; vty_init(&vty_info); logging_vty_add_cmds(); diff --git a/src/host/layer23/src/mobile/gapk_io.c b/src/host/layer23/src/mobile/gapk_io.c new file mode 100644 index 0000000..b2b55d9 --- /dev/null +++ b/src/host/layer23/src/mobile/gapk_io.c @@ -0,0 +1,571 @@ +/* + * GAPK (GSM Audio Pocket Knife) based audio I/O + * + * (C) 2017-2022 by Vadim Yanitskiy <axilirator(a)gmail.com> + * Contributions by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <string.h> +#include <errno.h> + +#include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> + +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/gsm/protocol/gsm_08_58.h> + +#include <osmocom/gapk/procqueue.h> +#include <osmocom/gapk/formats.h> +#include <osmocom/gapk/codecs.h> +#include <osmocom/gapk/common.h> + +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/logging.h> + +#include <osmocom/bb/mobile/voice.h> +#include <osmocom/bb/mobile/gapk_io.h> + +/* The RAW PCM format is common for both audio source and sink */ +static const struct osmo_gapk_format_desc *rawpcm_fmt; + +static int pq_queue_tch_fb_recv(void *_state, uint8_t *out, + const uint8_t *in, unsigned int in_len) +{ + struct gapk_io_state *state = (struct gapk_io_state *)_state; + struct msgb *tch_msg; + size_t frame_len; + + /* Obtain one TCH frame from the DL buffer */ + tch_msg = msgb_dequeue_count(&state->tch_dl_fb, + &state->tch_dl_fb_len); + if (tch_msg == NULL) + return -EIO; + + /* Calculate received frame length */ + frame_len = msgb_l3len(tch_msg); + + /* Copy the frame bytes from message */ + memcpy(out, tch_msg->l3h, frame_len); + + /* Release memory */ + msgb_free(tch_msg); + + return frame_len; +} + +static int pq_queue_tch_fb_send(void *_state, uint8_t *out, + const uint8_t *in, unsigned int in_len) +{ + struct gapk_io_state *state = (struct gapk_io_state *)_state; + struct msgb *tch_msg; + + if (state->tch_ul_fb_len >= GAPK_ULDL_QUEUE_LIMIT) { + LOGP(DGAPK, LOGL_ERROR, "UL TCH frame buffer overflow, dropping msg\n"); + return -EOVERFLOW; + } + + /* Allocate a new message for the lower layers */ + tch_msg = msgb_alloc_headroom(in_len + 64, 64, "TCH frame"); + if (tch_msg == NULL) + return -ENOMEM; + + /* Copy the frame bytes to a new message */ + tch_msg->l2h = msgb_put(tch_msg, in_len); + memcpy(tch_msg->l2h, in, in_len); + + /* Put encoded TCH frame to the UL buffer */ + msgb_enqueue_count(&state->tch_ul_fb, tch_msg, + &state->tch_ul_fb_len); + + return 0; +} + +/** + * A custom TCH frame buffer block, which actually + * handles incoming frames from DL buffer and puts + * outgoing frames to UL buffer... + */ +static int pq_queue_tch_fb(struct osmo_gapk_pq *pq, + struct gapk_io_state *io_state, + bool is_src) +{ + struct osmo_gapk_pq_item *item; + unsigned int frame_len; + + LOGP(DGAPK, LOGL_DEBUG, "PQ '%s': Adding TCH frame buffer %s\n", + pq->name, is_src ? "input" : "output"); + + /* Allocate and add a new queue item */ + item = osmo_gapk_pq_add_item(pq); + if (item == NULL) + return -ENOMEM; + + /* General item type and description */ + item->type = is_src ? OSMO_GAPK_ITEM_TYPE_SOURCE : OSMO_GAPK_ITEM_TYPE_SINK; + item->cat_name = is_src ? "source" : "sink"; + item->sub_name = "tch_fb"; + + /* I/O length */ + frame_len = io_state->phy_fmt_desc->frame_len; + item->len_in = is_src ? 0 : frame_len; + item->len_out = is_src ? frame_len : 0; + + /* Handler and it's state */ + item->proc = is_src ? &pq_queue_tch_fb_recv : &pq_queue_tch_fb_send; + item->state = io_state; + + return 0; +} + +/** + * Auxiliary wrapper around format conversion block. + * Is used to perform either a conversion from the format, + * produced by encoder, to canonical, or a conversion + * from canonical format to the format expected by decoder. + */ +static int pq_queue_codec_fmt_conv(struct osmo_gapk_pq *pq, + const struct osmo_gapk_codec_desc *codec, + bool is_src) +{ + const struct osmo_gapk_format_desc *codec_fmt_desc; + + /* Get format description */ + codec_fmt_desc = osmo_gapk_fmt_get_from_type(is_src ? + codec->codec_enc_format_type : codec->codec_dec_format_type); + if (codec_fmt_desc == NULL) + return -ENOTSUP; + + /* Put format conversion block */ + return osmo_gapk_pq_queue_fmt_convert(pq, codec_fmt_desc, !is_src); +} + +/** + * Prepares the following queue (source is mic): + * + * source/alsa -> proc/codec -> proc/format -> + * -> proc/format -> sink/tch_fb + * + * The two format conversion blocks are aimed to + * convert an encoder specific format + * to a PHY specific format. + */ +static int prepare_audio_source(struct gapk_io_state *gapk_io, + const char *alsa_input_dev) +{ + struct osmo_gapk_pq *pq; + char *pq_desc; + int rc; + + LOGP(DGAPK, LOGL_DEBUG, "Prepare audio input (capture) chain\n"); + + /* Allocate a processing queue */ + pq = osmo_gapk_pq_create("pq_audio_source"); + if (pq == NULL) + return -ENOMEM; + + /* ALSA audio source */ + rc = osmo_gapk_pq_queue_alsa_input(pq, alsa_input_dev, rawpcm_fmt->frame_len); + if (rc) + goto error; + + /* Frame encoder */ + rc = osmo_gapk_pq_queue_codec(pq, gapk_io->codec_desc, 1); + if (rc) + goto error; + + /* Encoder specific format -> canonical */ + rc = pq_queue_codec_fmt_conv(pq, gapk_io->codec_desc, true); + if (rc) + goto error; + + /* Canonical -> PHY specific format */ + rc = osmo_gapk_pq_queue_fmt_convert(pq, gapk_io->phy_fmt_desc, 1); + if (rc) + goto error; + + /* TCH frame buffer sink */ + rc = pq_queue_tch_fb(pq, gapk_io, false); + if (rc) + goto error; + + /* Check composed queue in strict mode */ + rc = osmo_gapk_pq_check(pq, 1); + if (rc) + goto error; + + /* Prepare queue (allocate buffers, etc.) */ + rc = osmo_gapk_pq_prepare(pq); + if (rc) + goto error; + + /* Save pointer within MS GAPK state */ + gapk_io->pq_source = pq; + + /* Describe prepared chain */ + pq_desc = osmo_gapk_pq_describe(pq); + LOGP(DGAPK, LOGL_DEBUG, "PQ '%s': chain '%s' prepared\n", pq->name, pq_desc); + talloc_free(pq_desc); + + return 0; + +error: + talloc_free(pq); + return rc; +} + +/** + * Prepares the following queue (sink is speaker): + * + * src/tch_fb -> proc/format -> [proc/ecu] -> + * proc/format -> proc/codec -> sink/alsa + * + * The two format conversion blocks (proc/format) + * are aimed to convert a PHY specific format + * to an encoder specific format. + * + * A ECU (Error Concealment Unit) block is optionally + * added if implemented for a given codec. + */ +static int prepare_audio_sink(struct gapk_io_state *gapk_io, + const char *alsa_output_dev) +{ + struct osmo_gapk_pq *pq; + char *pq_desc; + int rc; + + LOGP(DGAPK, LOGL_DEBUG, "Prepare audio output (playback) chain\n"); + + /* Allocate a processing queue */ + pq = osmo_gapk_pq_create("pq_audio_sink"); + if (pq == NULL) + return -ENOMEM; + + /* TCH frame buffer source */ + rc = pq_queue_tch_fb(pq, gapk_io, true); + if (rc) + goto error; + +#if 0 + /* TODO: PHY specific format -> canonical */ + rc = osmo_gapk_pq_queue_fmt_convert(pq, gapk_io->phy_fmt_desc, 0); + if (rc) + goto error; +#endif + + /* Optional ECU (Error Concealment Unit) */ + osmo_gapk_pq_queue_ecu(pq, gapk_io->codec_desc); + +#if 0 + /* TODO: canonical -> decoder specific format */ + rc = pq_queue_codec_fmt_conv(pq, gapk_io->codec_desc, false); + if (rc) + goto error; +#endif + + /* Frame decoder */ + rc = osmo_gapk_pq_queue_codec(pq, gapk_io->codec_desc, 0); + if (rc) + goto error; + + /* ALSA audio sink */ + rc = osmo_gapk_pq_queue_alsa_output(pq, alsa_output_dev, rawpcm_fmt->frame_len); + if (rc) + goto error; + + /* Check composed queue in strict mode */ + rc = osmo_gapk_pq_check(pq, 1); + if (rc) + goto error; + + /* Prepare queue (allocate buffers, etc.) */ + rc = osmo_gapk_pq_prepare(pq); + if (rc) + goto error; + + /* Save pointer within MS GAPK state */ + gapk_io->pq_sink = pq; + + /* Describe prepared chain */ + pq_desc = osmo_gapk_pq_describe(pq); + LOGP(DGAPK, LOGL_DEBUG, "PQ '%s': chain '%s' prepared\n", pq->name, pq_desc); + talloc_free(pq_desc); + + return 0; + +error: + talloc_free(pq); + return rc; +} + +/** + * Cleans up both TCH frame I/O buffers, destroys both + * processing queues (chains), and deallocates the memory. + * Should be called when a voice call is finished... + */ +int gapk_io_clean_up_ms(struct osmocom_ms *ms) +{ + struct msgb *msg; + + if (ms->gapk_io == NULL) + return 0; + + /* Flush TCH frame I/O buffers */ + while ((msg = msgb_dequeue(&ms->gapk_io->tch_dl_fb))) + msgb_free(msg); + while ((msg = msgb_dequeue(&ms->gapk_io->tch_ul_fb))) + msgb_free(msg); + + /* Destroy both audio I/O chains */ + if (ms->gapk_io->pq_source) + osmo_gapk_pq_destroy(ms->gapk_io->pq_source); + if (ms->gapk_io->pq_sink) + osmo_gapk_pq_destroy(ms->gapk_io->pq_sink); + + talloc_free(ms->gapk_io); + ms->gapk_io = NULL; + + return 0; +} + +/** + * Picks the corresponding PHY's frame format for a given codec. + * To be used with PHYs that produce audio frames in RTP format, + * such as trxcon (GSM 05.03 libosmocoding API). + */ +static enum osmo_gapk_format_type phy_fmt_pick_rtp(enum osmo_gapk_codec_type codec) +{ + switch (codec) { + case CODEC_HR: + return FMT_RTP_HR_IETF; + case CODEC_FR: + return FMT_GSM; + case CODEC_EFR: + return FMT_RTP_EFR; + case CODEC_AMR: + return FMT_RTP_AMR; + default: + return FMT_INVALID; + } +} + +/** + * Allocates both TCH frame I/O buffers + * and prepares both processing queues (chains). + * Should be called when a voice call is initiated... + */ +int gapk_io_init_ms(struct osmocom_ms *ms, enum osmo_gapk_codec_type codec) +{ + const struct osmo_gapk_format_desc *phy_fmt_desc; + const struct osmo_gapk_codec_desc *codec_desc; + struct gsm_settings *set = &ms->settings; + enum osmo_gapk_format_type phy_fmt; + struct gapk_io_state *gapk_io; + int rc = 0; + + LOGP(DGAPK, LOGL_NOTICE, "Initialize GAPK I/O\n"); + + OSMO_ASSERT(ms->gapk_io == NULL); + + /* Make sure that the chosen codec has description */ + codec_desc = osmo_gapk_codec_get_from_type(codec); + if (codec_desc == NULL) { + LOGP(DGAPK, LOGL_ERROR, "Invalid codec type 0x%02x\n", codec); + return -EINVAL; + } + + /* Make sure that the chosen codec is supported */ + if (codec_desc->codec_encode == NULL || codec_desc->codec_decode == NULL) { + LOGP(DGAPK, LOGL_ERROR, + "Codec '%s' is not supported by GAPK\n", codec_desc->name); + return -ENOTSUP; + } + + /** + * Pick the corresponding PHY's frame format + * TODO: ask PHY, which format is supported? + * FIXME: RTP (valid for trxcon) is used for now + */ + phy_fmt = phy_fmt_pick_rtp(codec); + phy_fmt_desc = osmo_gapk_fmt_get_from_type(phy_fmt); + if (phy_fmt_desc == NULL) { + LOGP(DGAPK, LOGL_ERROR, "Failed to pick the PHY specific " + "frame format for codec '%s'\n", codec_desc->name); + return -EINVAL; + } + + gapk_io = talloc_zero(ms, struct gapk_io_state); + if (gapk_io == NULL) { + LOGP(DGAPK, LOGL_ERROR, "Failed to allocate memory\n"); + return -ENOMEM; + } + + /* Init TCH frame I/O buffers */ + INIT_LLIST_HEAD(&gapk_io->tch_dl_fb); + INIT_LLIST_HEAD(&gapk_io->tch_ul_fb); + + /* Store the codec / format description */ + gapk_io->codec_desc = codec_desc; + gapk_io->phy_fmt_desc = phy_fmt_desc; + + /* Use gapk_io_state as talloc context for both chains */ + osmo_gapk_set_talloc_ctx(gapk_io); + + /* Prepare both source and sink chains */ + rc |= prepare_audio_source(gapk_io, set->audio.alsa_input_dev); + rc |= prepare_audio_sink(gapk_io, set->audio.alsa_output_dev); + + /* Fall back to ms instance */ + osmo_gapk_set_talloc_ctx(ms); + + /* If at lease one chain constructor failed */ + if (rc) { + /* Destroy both audio I/O chains */ + if (gapk_io->pq_source) + osmo_gapk_pq_destroy(gapk_io->pq_source); + if (gapk_io->pq_sink) + osmo_gapk_pq_destroy(gapk_io->pq_sink); + + /* Release the memory and return */ + talloc_free(gapk_io); + + LOGP(DGAPK, LOGL_ERROR, "Failed to initialize GAPK I/O\n"); + return rc; + } + + /* Init pointers */ + ms->gapk_io = gapk_io; + + LOGP(DGAPK, LOGL_NOTICE, + "GAPK I/O initialized for MS '%s', codec '%s'\n", + ms->name, codec_desc->name); + + return 0; +} + +/** + * Wrapper around gapk_io_init_ms(), that maps both + * given GSM 04.08 channel type (HR/FR) and channel + * mode to a codec from 'osmo_gapk_codec_type' enum, + * checks if a mapped codec is supported by GAPK, + * and finally calls the wrapped function. + */ +int gapk_io_init_ms_chan(struct osmocom_ms *ms, + uint8_t ch_type, uint8_t ch_mode) +{ + enum osmo_gapk_codec_type codec; + + /* Map GSM 04.08 channel mode to GAPK codec type */ + switch (ch_mode) { + case GSM48_CMODE_SPEECH_V1: /* FR or HR */ + if (ch_type == RSL_CHAN_Bm_ACCHs) + codec = CODEC_FR; + else + codec = CODEC_HR; + break; + + case GSM48_CMODE_SPEECH_EFR: + codec = CODEC_EFR; + break; + + case GSM48_CMODE_SPEECH_AMR: + codec = CODEC_AMR; + break; + + /* Signalling or CSD, do nothing */ + case GSM48_CMODE_DATA_14k5: + case GSM48_CMODE_DATA_12k0: + case GSM48_CMODE_DATA_6k0: + case GSM48_CMODE_DATA_3k6: + case GSM48_CMODE_SIGN: + return 0; + default: + LOGP(DGAPK, LOGL_ERROR, "Unhandled channel mode 0x%02x (%s)\n", + ch_mode, get_value_string(gsm48_chan_mode_names, ch_mode)); + return -EINVAL; + } + + return gapk_io_init_ms(ms, codec); +} + +/** + * Performs basic initialization of GAPK library, + * setting the talloc root context and a logging category. + * Should be called during the application initialization... + */ +void gapk_io_init(void) +{ + /* Init logging subsystem */ + osmo_gapk_log_init(DGAPK); + + /* Make RAWPCM format info easy to access */ + rawpcm_fmt = osmo_gapk_fmt_get_from_type(FMT_RAWPCM_S16LE); +} + +void gapk_io_enqueue_dl(struct gapk_io_state *state, struct msgb *msg) +{ + if (state->tch_dl_fb_len >= GAPK_ULDL_QUEUE_LIMIT) { + LOGP(DGAPK, LOGL_ERROR, "DL TCH frame buffer overflow, dropping msg\n"); + msgb_free(msg); + return; + } + + msgb_enqueue_count(&state->tch_dl_fb, msg, + &state->tch_dl_fb_len); +} + +/* Serves both UL/DL TCH frame I/O buffers */ +int gapk_io_serve_ms(struct osmocom_ms *ms) +{ + struct gapk_io_state *gapk_io = ms->gapk_io; + int work = 0; + + /** + * Make sure we have at least two DL frames + * to prevent discontinuous playback. + */ + if (gapk_io->tch_dl_fb_len < 2) + return 0; + + /** + * TODO: if there is an active call, but no TCH frames + * in DL buffer, put silence frames using the upcoming + * ECU (Error Concealment Unit) of libosmocodec. + */ + while (!llist_empty(&gapk_io->tch_dl_fb)) { + /* Decode and play a received DL TCH frame */ + osmo_gapk_pq_execute(gapk_io->pq_sink); + + /* Record and encode an UL TCH frame back */ + osmo_gapk_pq_execute(gapk_io->pq_source); + + work |= 1; + } + + while (!llist_empty(&gapk_io->tch_ul_fb)) { + struct msgb *tch_msg; + + /* Obtain one TCH frame from the UL buffer */ + tch_msg = msgb_dequeue_count(&gapk_io->tch_ul_fb, + &gapk_io->tch_ul_fb_len); + + /* Push a voice frame to the lower layers */ + gsm_send_voice_msg(ms, tch_msg); + + work |= 1; + } + + return work; +} diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 65b021a..610242c 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -75,6 +75,8 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/l1ctl.h> + +#include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/vty.h> #include <osmocom/bb/common/utils.h> @@ -3473,6 +3475,15 @@ && ch_type != RSL_CHAN_Lm_ACCHs) return -ENOTSUP; +#ifdef WITH_GAPK_IO + /* Poke GAPK audio back-end, if it is chosen */ + if (ms->settings.audio.io_handler == AUDIO_IOH_GAPK) { + int rc = gapk_io_init_ms_chan(ms, ch_type, mode); + if (rc) + return rc; + } +#endif + /* Apply indicated channel mode */ LOGP(DRR, LOGL_INFO, "setting TCH mode to %s, audio mode to %d\n", get_value_string(gsm48_chan_mode_names, mode), rr->audio_mode); @@ -4019,6 +4030,12 @@ if (cause) return gsm48_rr_tx_ass_fail(ms, cause, RSL_MT_DATA_REQ); +#ifdef WITH_GAPK_IO + /* Poke GAPK audio back-end, if it is chosen */ + if (ms->settings.audio.io_handler == AUDIO_IOH_GAPK) + gapk_io_init_ms_chan(ms, ch_type, cda->mode); +#endif + #ifdef TEST_FREQUENCY_MOD LOGP(DRR, LOGL_INFO, " TESTING: frequency modify ASS.CMD\n"); before_time = 1; @@ -5622,6 +5639,7 @@ break; case AUDIO_IOH_MNCC_SOCK: case AUDIO_IOH_LOOPBACK: + case AUDIO_IOH_GAPK: rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; break; case AUDIO_IOH_NONE: diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index 926358e..088e6c9 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -58,7 +58,7 @@ const char *debug_default = - "DCS:DNB:DPLMN:DRR:DMM:DSIM:DCC:DMNCC:DSS:DLSMS:DPAG:DSUM:DSAP:DGPS:DMOB:DPRIM:DLUA"; + "DCS:DNB:DPLMN:DRR:DMM:DSIM:DCC:DMNCC:DSS:DLSMS:DPAG:DSUM:DSAP:DGPS:DMOB:DPRIM:DLUA:DGAPK"; const char *openbsc_copyright = "Copyright (C) 2010-2015 Andreas Eversberg, Sylvain Munaut, Holger Freyther, Harald Welte\n" diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index 7627c11..02a5ff7 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -29,6 +29,7 @@ static char *layer2_socket_path = "/tmp/osmocom_l2"; static char *sap_socket_path = "/tmp/osmocom_sap"; static char *mncc_socket_path = "/tmp/ms_mncc"; +static char *alsa_dev_default = "default"; int gsm_settings_init(struct osmocom_ms *ms) { @@ -44,6 +45,8 @@ /* Audio settings: drop TCH frames by default */ set->audio.io_handler = AUDIO_IOH_NONE; + OSMO_STRLCPY_ARRAY(set->audio.alsa_output_dev, alsa_dev_default); + OSMO_STRLCPY_ARRAY(set->audio.alsa_input_dev, alsa_dev_default); /* Built-in MNCC handler */ set->mncc_handler = MNCC_HANDLER_INTERNAL; @@ -203,6 +206,7 @@ const struct value_string audio_io_handler_names[] = { { AUDIO_IOH_NONE, "none" }, + { AUDIO_IOH_GAPK, "gapk" }, { AUDIO_IOH_L1PHY, "l1phy" }, { AUDIO_IOH_MNCC_SOCK, "mncc-sock" }, { AUDIO_IOH_LOOPBACK, "loopback" }, diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index cb1718f..c3c6a6a 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -1,5 +1,7 @@ /* * (C) 2010 by Andreas Eversberg <jolly(a)eversberg.eu> + * (C) 2017-2018 by Vadim Yanitskiy <axilirator(a)gmail.com> + * (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * * All Rights Reserved * @@ -15,7 +17,8 @@ * */ -#include <stdlib.h> +#include <string.h> +#include <errno.h> #include <osmocom/core/msgb.h> #include <osmocom/codec/codec.h> @@ -24,6 +27,7 @@ #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/mobile/gapk_io.h> #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/voice.h> @@ -76,6 +80,15 @@ return gsm_send_voice_msg(ms, msg); case AUDIO_IOH_MNCC_SOCK: return gsm_forward_mncc(ms, msg); + case AUDIO_IOH_GAPK: +#ifdef WITH_GAPK_IO + /* Prevent null pointer dereference */ + OSMO_ASSERT(ms->gapk_io != NULL); + + /* Enqueue a frame to the DL TCH buffer */ + gapk_io_enqueue_dl(ms->gapk_io, msg); + break; +#endif case AUDIO_IOH_L1PHY: case AUDIO_IOH_NONE: /* Drop voice frame */ diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index a94f96b..3bab608 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -1543,8 +1543,14 @@ set->any_timeout, VTY_NEWLINE); vty_out(vty, " audio%s", VTY_NEWLINE); - if (!hide_default || set->audio.io_handler != AUDIO_IOH_NONE) - vty_out(vty, " io-handler %s%s", audio_io_handler_name(set->audio.io_handler), VTY_NEWLINE); + vty_out(vty, " io-handler %s%s", + audio_io_handler_name(set->audio.io_handler), VTY_NEWLINE); + if (set->audio.io_handler == AUDIO_IOH_GAPK) { + vty_out(vty, " alsa-output-dev %s%s", + set->audio.alsa_output_dev, VTY_NEWLINE); + vty_out(vty, " alsa-input-dev %s%s", + set->audio.alsa_input_dev, VTY_NEWLINE); + } /* no shutdown must be written to config, because shutdown is default */ vty_out(vty, " %sshutdown%s", (ms->shutdown != MS_SHUTDOWN_NONE) ? "" : "no ", @@ -2831,9 +2837,10 @@ } DEFUN(cfg_ms_audio_io_handler, cfg_ms_audio_io_handler_cmd, - "io-handler (none|l1phy|mncc-sock|loopback)", + "io-handler (none|gapk|l1phy|mncc-sock|loopback)", "Set TCH frame I/O handler\n" "No handler, drop TCH frames (default)\n" + "libosmo-gapk based I/O handler (requires ALSA)\n" "L1 PHY (e.g. Calypso DSP in Motorola C1xx phones)\n" "External MNCC application (e.g. LCR) via MNCC socket\n" "Return TCH frame payload back to sender\n") @@ -2849,6 +2856,13 @@ } } +#ifndef WITH_GAPK_IO + if (val == AUDIO_IOH_GAPK) { + vty_out(vty, "GAPK I/O is not compiled in (--with-gapk-io)%s", VTY_NEWLINE); + return CMD_WARNING; + } +#endif + return set_audio_io_handler(vty, val); } @@ -2858,6 +2872,34 @@ return set_audio_io_handler(vty, AUDIO_IOH_NONE); } +DEFUN(cfg_ms_audio_alsa_out_dev, cfg_ms_audio_alsa_out_dev_cmd, + "alsa-output-dev (default|NAME)", + "Set ALSA output (playback) device name (for GAPK only)\n" + "Default system playback device (default)\n" + "Name of a custom playback device") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + OSMO_STRLCPY_ARRAY(set->audio.alsa_output_dev, argv[0]); + + return CMD_SUCCESS; +} + +DEFUN(cfg_ms_audio_alsa_in_dev, cfg_ms_audio_alsa_in_dev_cmd, + "alsa-input-dev (default|NAME)", + "Set ALSA input (capture) device name (for GAPK only)\n" + "Default system recording device (default)\n" + "Name of a custom recording device") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + OSMO_STRLCPY_ARRAY(set->audio.alsa_input_dev, argv[0]); + + return CMD_SUCCESS; +} + DEFUN(cfg_no_shutdown, cfg_ms_no_shutdown_cmd, "no shutdown", NO_STR "Activate and run MS") { @@ -3134,6 +3176,8 @@ install_node(&audio_node, config_write_dummy); install_element(AUDIO_NODE, &cfg_ms_audio_io_handler_cmd); install_element(AUDIO_NODE, &cfg_ms_audio_no_io_handler_cmd); + install_element(AUDIO_NODE, &cfg_ms_audio_alsa_out_dev_cmd); + install_element(AUDIO_NODE, &cfg_ms_audio_alsa_in_dev_cmd); /* Register the talloc context introspection command */ osmo_talloc_vty_add_cmds(); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib86b0746606c191573cc773f01172afbb52f33a9 Gerrit-Change-Number: 30337 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <axilirator(a)gmail.com> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: add missing TCH MNCC messages and handle them

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30397 ) Change subject: mobile: add missing TCH MNCC messages and handle them ...................................................................... mobile: add missing TCH MNCC messages and handle them Change-Id: I28a1ae1ed504748c33c64c86ca7d57a94c7c7c6d Related: OS#5599 --- M src/host/layer23/include/osmocom/bb/mobile/mncc.h M src/host/layer23/src/mobile/gsm48_cc.c M src/host/layer23/src/mobile/mncc_sock.c M src/host/layer23/src/mobile/voice.c 4 files changed, 25 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h index c373412..ebc58a5 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h @@ -104,6 +104,9 @@ #define GSM_TCHF_FRAME 0x0300 #define GSM_TCHF_FRAME_EFR 0x0301 +#define GSM_TCHH_FRAME 0x0302 +#define GSM_TCH_FRAME_AMR 0x0303 +#define GSM_BAD_FRAME 0x03ff #define GSM_MAX_FACILITY 128 #define GSM_MAX_SSVERSION 128 diff --git a/src/host/layer23/src/mobile/gsm48_cc.c b/src/host/layer23/src/mobile/gsm48_cc.c index 503c9fd..1be53ba 100644 --- a/src/host/layer23/src/mobile/gsm48_cc.c +++ b/src/host/layer23/src/mobile/gsm48_cc.c @@ -1966,6 +1966,10 @@ switch (msg_type) { case GSM_TCHF_FRAME: + case GSM_TCHF_FRAME_EFR: + case GSM_TCHH_FRAME: + case GSM_TCH_FRAME_AMR: + case GSM_BAD_FRAME: return gsm_send_voice_frame(ms, arg); case MNCC_LCHAN_MODIFY: return 0; diff --git a/src/host/layer23/src/mobile/mncc_sock.c b/src/host/layer23/src/mobile/mncc_sock.c index 856b2c5..514ab72 100644 --- a/src/host/layer23/src/mobile/mncc_sock.c +++ b/src/host/layer23/src/mobile/mncc_sock.c @@ -46,13 +46,19 @@ /* Check if we currently have a MNCC handler connected */ if (state->conn_bfd.fd < 0) { + struct gsm_mncc mncc_out; LOGP(DMNCC, LOGL_ERROR, "mncc_sock receives %s for external CC app " "but socket is gone\n", get_mncc_name(msg_type)); - if (msg_type != GSM_TCHF_FRAME - && msg_type != GSM_TCHF_FRAME_EFR - && msg_type != MNCC_REL_IND) { + switch (msg_type) { + case MNCC_REL_IND: + case GSM_TCHF_FRAME: + case GSM_TCHF_FRAME_EFR: + case GSM_TCHH_FRAME: + case GSM_TCH_FRAME_AMR: + case GSM_BAD_FRAME: + break; + default: /* release the request */ - struct gsm_mncc mncc_out; memset(&mncc_out, 0, sizeof(mncc_out)); mncc_out.callref = mncc_in->callref; mncc_set_cause(&mncc_out, GSM48_CAUSE_LOC_PRN_S_LU, diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 4b5f792..1159fbb 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -82,14 +82,18 @@ struct msgb *nmsg; int len; - switch (ms->rrlayer.cd_now.mode) { - case GSM48_CMODE_SPEECH_V1: - /* FIXME: FR only, check for TCH/F (FR) and TCH/H (HR) */ + switch (frame->msg_type) { + case GSM_TCHF_FRAME: len = GSM_FR_BYTES; break; - case GSM48_CMODE_SPEECH_EFR: + case GSM_TCHF_FRAME_EFR: len = GSM_EFR_BYTES; break; + case GSM_TCHH_FRAME: + len = GSM_HR_BYTES; + break; + /* TODO: case GSM_TCH_FRAME_AMR (variable length) */ + /* TODO: case GSM_BAD_FRAME (empty?) */ default: LOGP(DL1C, LOGL_ERROR, "%s(): msg_type=0x%02x: not implemented\n", __func__, frame->msg_type); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I28a1ae1ed504748c33c64c86ca7d57a94c7c7c6d Gerrit-Change-Number: 30397 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: improve function comments in voice.c

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30398 ) Change subject: mobile: improve function comments in voice.c ...................................................................... mobile: improve function comments in voice.c Change-Id: I0285a07841bdc2568374f9e9cd0214eef1415186 Related: OS#5599 --- M src/host/layer23/src/mobile/voice.c 1 file changed, 4 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 1159fbb..1e664dc 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -25,11 +25,7 @@ #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/voice.h> - -/* - * receive voice - */ - +/* Receive a Downlink voice frame from the lower layers */ static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg) { struct gsm_data_frame *mncc; @@ -68,15 +64,14 @@ return 0; } -/* - * send voice - */ +/* Send an Uplink voice frame to the lower layers */ int gsm_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg) { /* Forward to RR */ return gsm48_rr_tx_voice(ms, msg); } +/* gsm_send_voice_msg() wrapper accepting an MNCC structure */ int gsm_send_voice_frame(struct osmocom_ms *ms, const struct gsm_data_frame *frame) { struct msgb *nmsg; @@ -109,10 +104,7 @@ return gsm_send_voice_msg(ms, nmsg); } -/* - * init - */ - +/* Initialize voice router */ int gsm_voice_init(struct osmocom_ms *ms) { ms->l1_entity.l1_traffic_ind = gsm_recv_voice; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0285a07841bdc2568374f9e9cd0214eef1415186 Gerrit-Change-Number: 30398 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: rework gsm_recv_voice(), add AUDIO_IOH_MNCC_SOCK

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30399 ) Change subject: mobile: rework gsm_recv_voice(), add AUDIO_IOH_MNCC_SOCK ...................................................................... mobile: rework gsm_recv_voice(), add AUDIO_IOH_MNCC_SOCK Do not send voice frames to the external MNCC unconditionally. Add a new I/O handler type for the external MNCC application. Change-Id: I406b169963e6654110329d741728fa12c8c8eeec Related: OS#5599 --- M src/host/layer23/include/osmocom/bb/mobile/settings.h M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/settings.c M src/host/layer23/src/mobile/voice.c M src/host/layer23/src/mobile/vty_interface.c 5 files changed, 36 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/mobile/settings.h b/src/host/layer23/include/osmocom/bb/mobile/settings.h index 8edde53..27b9f5a 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/settings.h +++ b/src/host/layer23/include/osmocom/bb/mobile/settings.h @@ -19,6 +19,8 @@ AUDIO_IOH_NONE = 0, /* L1 PHY (e.g. Calypso DSP) */ AUDIO_IOH_L1PHY, + /* External MNCC app (via MNCC socket) */ + AUDIO_IOH_MNCC_SOCK, /* Return to sender */ AUDIO_IOH_LOOPBACK, }; diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 08242ee..65b021a 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -5620,6 +5620,7 @@ case AUDIO_IOH_L1PHY: rr->audio_mode = AUDIO_RX_SPEAKER | AUDIO_TX_MICROPHONE; break; + case AUDIO_IOH_MNCC_SOCK: case AUDIO_IOH_LOOPBACK: rr->audio_mode = AUDIO_RX_TRAFFIC_IND | AUDIO_TX_TRAFFIC_REQ; break; diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index 10e9984..7627c11 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -204,6 +204,7 @@ const struct value_string audio_io_handler_names[] = { { AUDIO_IOH_NONE, "none" }, { AUDIO_IOH_L1PHY, "l1phy" }, + { AUDIO_IOH_MNCC_SOCK, "mncc-sock" }, { AUDIO_IOH_LOOPBACK, "loopback" }, { 0x00, NULL} }; diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 1e664dc..5833cad 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -25,8 +25,8 @@ #include <osmocom/bb/mobile/mncc.h> #include <osmocom/bb/mobile/voice.h> -/* Receive a Downlink voice frame from the lower layers */ -static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg) +/* Forward a Downlink voice frame to the external MNCC handler */ +static int gsm_forward_mncc(struct osmocom_ms *ms, struct msgb *msg) { struct gsm_data_frame *mncc; @@ -50,10 +50,6 @@ goto exit_free; } - /* send voice frame back, if appropriate */ - if (ms->settings.audio.io_handler == AUDIO_IOH_LOOPBACK) - gsm_send_voice_frame(ms, mncc); - /* distribute and then free */ if (ms->mncc_entity.mncc_recv && ms->mncc_entity.ref) { ms->mncc_entity.mncc_recv(ms, mncc->msg_type, mncc); @@ -64,6 +60,24 @@ return 0; } +/* Receive a Downlink voice frame from the lower layers */ +static int gsm_recv_voice(struct osmocom_ms *ms, struct msgb *msg) +{ + switch (ms->settings.audio.io_handler) { + case AUDIO_IOH_LOOPBACK: + /* Send voice frame back */ + return gsm_send_voice_msg(ms, msg); + case AUDIO_IOH_MNCC_SOCK: + return gsm_forward_mncc(ms, msg); + case AUDIO_IOH_L1PHY: + case AUDIO_IOH_NONE: + /* Drop voice frame */ + msgb_free(msg); + } + + return 0; +} + /* Send an Uplink voice frame to the lower layers */ int gsm_send_voice_msg(struct osmocom_ms *ms, struct msgb *msg) { diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index e3005ca..a94f96b 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -2831,13 +2831,24 @@ } DEFUN(cfg_ms_audio_io_handler, cfg_ms_audio_io_handler_cmd, - "io-handler (none|l1phy|loopback)", + "io-handler (none|l1phy|mncc-sock|loopback)", "Set TCH frame I/O handler\n" "No handler, drop TCH frames (default)\n" "L1 PHY (e.g. Calypso DSP in Motorola C1xx phones)\n" + "External MNCC application (e.g. LCR) via MNCC socket\n" "Return TCH frame payload back to sender\n") { + struct osmocom_ms *ms = (struct osmocom_ms *) vty->index; int val = get_string_value(audio_io_handler_names, argv[0]); + + if (val == AUDIO_IOH_MNCC_SOCK) { + if (ms->settings.mncc_handler != MNCC_HANDLER_INTERNAL) { + vty_out(vty, "Audio I/O handler 'mncc-sock' can only be used " + "with MNCC handler 'external'%s", VTY_NEWLINE); + return CMD_WARNING; + } + } + return set_audio_io_handler(vty, val); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I406b169963e6654110329d741728fa12c8c8eeec Gerrit-Change-Number: 30399 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: integrate GAPK based audio (voice) I/O support

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30337 ) Change subject: mobile: integrate GAPK based audio (voice) I/O support ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30337 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib86b0746606c191573cc773f01172afbb52f33a9 Gerrit-Change-Number: 30337 Gerrit-PatchSet: 8 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <axilirator(a)gmail.com> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Dec 2022 11:18:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-trx[master]: ms-trx support

by Hoernchen

Attention is currently required from: fixeria, pespin. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30416 ) Change subject: ms-trx support ...................................................................... Patch Set 4: (37 comments) File Makefile.am: https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/8557aa21_1a4ffec0 PS3, Line 37: osmocom-bb/src/host/trxcon \ > Ack. Most likely he forgot to remove this line. Done File Transceiver52M/Makefile.am: https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/ab495219_3ad23e55 PS3, Line 26: AM_CPPFLAGS > '-I' stuff should be in CPPFLAGS only, it makes no sense to have it in CFLAGS/CXXFLAGS. Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/ef318324_7f99c032 PS3, Line 77: LIBOSMOCODING_LIBS > Having LIBOSMOCODING_LIBS in COMMON_LDADD makes all osmo-trx-* binaries depend on libosmocoding, whi […] Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/7dbf1157_40ebb075 PS3, Line 90: noinst_HEADERS > This should be done conditionally too, but not critical I guess. Done File Transceiver52M/ms/itrq.h: https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/27a2e661_cd56fde8 PS3, Line 34: /* > weird comment formatting, please make it consistent with the copyright header Done File Transceiver52M/ms/l1ctl_server_cb.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/1c7497e2_ec2b34dc PS3, Line 65: osmocom_l2 > TODO: make path configurable Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/57fa3766_3292a919 PS3, Line 74: return > so the app keeps running if l1ctl_server_alloc() fails? Done File Transceiver52M/ms/logging.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/a2f6a6eb_8ec2be8e PS3, Line 54: loglevel = LOGL_NOTICE > spacing issues Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/ed44894c_88a9b155 PS3, Line 57: DTRXC > not used by libtrxcon nor needed Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/278cf1d8_349e019f PS3, Line 64: DTRXD > not used by libtrxcon nor needed Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/10a88d01_ee4fa15a PS3, Line 75: .loglevel = LOGL_NOTICE, > spacing issues Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/d69f7024_80c92d1a PS3, Line 76: enabled = 0, > why disabled? too nuch unbounded log spam impacts timing. https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/b6ec8fb5_6b42d5f4 PS3, Line 82: .loglevel = LOGL_NOTICE, > spacing issues Done File Transceiver52M/ms/ms_upper.h: https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/925d5d4e_ee890a3f PS3, Line 1: > ws Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/6b046a98_0c6d47aa PS3, Line 36: trx_if > do you really need/use TRXC/TRXD here? Done File Transceiver52M/ms/ms_upper.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/cd859f9b_9180321b PS3, Line 61: #include <osmocom/core/gsmtap_util.h> > you're not using GSMTAP API here... Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/499172f8_05f316dc PS3, Line 64: // #include <osmocom/core/application.h> > removeme Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/0d7e67c3_d3a9ea3a PS3, Line 71: trx_if > do you really need/use TRXC/TRXD here? Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/e6956264_e4693cf4 PS3, Line 74: #include <osmocom/bb/l1sched/l1sched.h> > I don't see any l1sched_* API used in this file. Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/50ed90bd_c350e3e7 PS3, Line 177: return trash > can you clarify this a bit further? thrash? fcch bursts contain "nothing", but the old trxcon needed "something" to tickle the scheduler. There are only 3 burst types, so explictily listing all of those is fine, even if the new scheduler allows skipping those and the function returns early. https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/4b19fa0c_2a6ef870 PS3, Line 184: RSSI = 10 > why 10? random reasonable value, the SCH burst is only demodulated once in the timekeeping part because doing it twice introduces massive latency spikes comapared to NB that are only handled in the upper layer, so there is no opportunity here to measure anything because only the demodded bits are passed to the upper layer in the SCH case. https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/dbf421e4_47d1aabf PS3, Line 223: timingOffset = (int)round(0); > TODO/FIXME? Done In practice the alignment does not matter because the lower loop continuously tracks and updates it anyway so the only offset available would be the short term offset until it gets updated and reset to 0. https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/b42d80bc_257ccd2a PS3, Line 238: trx_data_rx_handler > removeme Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/c7baa8e3_a29f5253 PS3, Line 246: trxcon_phyif_handle_clock_ind > removeme Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/a644c068_f9d7149e PS3, Line 304: case trxcon::TRXCON_PHYIF_CMDT_RESET > Better use value-string for that. […] This mostly exists for debugging the order of actions here and should not really be used for anything else. It's just easier to use than signaltap or other custom markers. In practice for general purpose logging trxcon/the l1ctl handler knows what is going on anyway. https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/067b8844_59e02d0a PS3, Line 352: set_ta > Shouldn't this be done on receipt of TRXCON_PHYIF_CMDT_RESET instead? Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/14fe4b6f_7d7255a9 PS3, Line 357: dbm = -80 > please add a FIXME or TODO, so it's clear that the measurement logic is missing Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/70971d36_b612055b PS3, Line 364: gsm_arfcn2freq10 > careful, this function may return 0xffff In practice we mostly want to use different frequencies anyway, but for current testing and usage we just stick to "a" arfcn and that's it. If wrong arfcns are passed that are not part of the gsm ranges everything is broken anyway... https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/dff33073_293e488a PS3, Line 385: assert > OSMO_ASSERT? Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/bd8bb51d_b634bc66 PS3, Line 425: trxcon > it's not trxcon app anymore but this "is" the global trxcon context used for all trxcon stuff and this is only being used by the "main loop" upper thread doing trxcon things... https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/aef3dc97_b8c24196 PS3, Line 429: 3 > pass 0 to avoid confusion, we're not using fn_advance here Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/7945fb2f_e09c12db PS3, Line 430: gsmtap = 0; > gsmtap is a pointer, so = NULL Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/98c4b4de_b3d3dfdb PS3, Line 431: 0x1234 > What's this? Why not NULL? Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/2b0108db_523b8342 PS3, Line 433: trxc > I would avoid using 'trxc' here to avoid confusion with the TRXC protocol. Done File configure.ac: https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/fc9cdab4_377081c8 PS3, Line 330: test -d osmocom-bb > A proper approach would be making this configurable: --enable-ms or --with-ms. Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/619bda41_d8b301b6 PS3, Line 333: AC_MSG_NOTICE(["Enabling ms-trx..."]) > spacing issues Done https://gerrit.osmocom.org/c/osmo-trx/+/30416/comment/dfc70a11_6afaee32 PS3, Line 364: doc/manuals/Makefile \ > Ack, it's one of my fixups: https://cgit.osmocom. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I36c65a8c725c4da76dc70006cd96b0a2b6878e84 Gerrit-Change-Number: 30416 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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: Fri, 02 Dec 2022 11:17:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: gsm_forward_mncc(): properly mark TCH/H frames

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30401 ) Change subject: mobile: gsm_forward_mncc(): properly mark TCH/H frames ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id3f459bc767ebf31469287fa672893239c5977d9 Gerrit-Change-Number: 30401 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Dec 2022 11:17:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: gsm_forward_mncc(): call mncc_sock_from_cc() directly

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30400 ) Change subject: mobile: gsm_forward_mncc(): call mncc_sock_from_cc() directly ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I29305866e61a0bc3bd082108af6a9ba8ff86bcf2 Gerrit-Change-Number: 30400 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Dec 2022 11:17:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: rework gsm_recv_voice(), add AUDIO_IOH_MNCC_SOCK

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30399 ) Change subject: mobile: rework gsm_recv_voice(), add AUDIO_IOH_MNCC_SOCK ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I406b169963e6654110329d741728fa12c8c8eeec Gerrit-Change-Number: 30399 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Dec 2022 11:17:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: improve function comments in voice.c

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30398 ) Change subject: mobile: improve function comments in voice.c ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30398 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0285a07841bdc2568374f9e9cd0214eef1415186 Gerrit-Change-Number: 30398 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Dec 2022 11:16:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: add missing TCH MNCC messages and handle them

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30397 ) Change subject: mobile: add missing TCH MNCC messages and handle them ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I28a1ae1ed504748c33c64c86ca7d57a94c7c7c6d Gerrit-Change-Number: 30397 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Dec 2022 11:16:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in docker-playground[master]: ttcn3-docker-run.sh: Use interface "up" flag, not operstate

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30383 ) Change subject: ttcn3-docker-run.sh: Use interface "up" flag, not operstate ...................................................................... ttcn3-docker-run.sh: Use interface "up" flag, not operstate Don't use the "operstate" sysfs attribute to determine if an interface is "up", use the actual UP-flag (0x01) in the "flags" sysfs attribute. The "operstate" attribute may at least occasionally be "unknown" and remain in that state (causing jenkins jobs to wait indefinitely), while the flags (which we don't look at before this patch) indicates it is "up". This is a fixup to the below commit: commit d2014603a736a17d6b92006b25aa41482365ef3d Author: Harald Welte <laforge(a)osmocom.org> Date: Wed Feb 3 22:05:43 2021 +0100 debian-stretch-titan: Wait for interface to be _up_ not just its existance Change-Id: Ib5c3bbe470ce874217437c2518df5ae07f0d8301 Closes: OS#5803 --- M debian-bullseye-titan/ttcn3-docker-run.sh 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian-bullseye-titan/ttcn3-docker-run.sh b/debian-bullseye-titan/ttcn3-docker-run.sh index c868220..26e291c 100755 --- a/debian-bullseye-titan/ttcn3-docker-run.sh +++ b/debian-bullseye-titan/ttcn3-docker-run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash if [ $# -lt 2 ]; then echo echo "usage: ttcn3-docker-run SUBDIR SUITE" @@ -18,11 +18,12 @@ pipework --wait -i "$WAIT_FOR_NETDEV" while true; do - if [ ! -f /sys/class/net/${WAIT_FOR_NETDEV}/operstate ]; then + if [ ! -f /sys/class/net/${WAIT_FOR_NETDEV}/flags ]; then exit 23 fi - OPSTATE=$(cat /sys/class/net/${WAIT_FOR_NETDEV}/operstate) - if [ "$OPSTATE" = "up" ]; then + FLAGS=$(cat /sys/class/net/${WAIT_FOR_NETDEV}/flags) + let FLAG_UP=$FLAGS\&1 + if [ "$FLAG_UP" = "1" ]; then break fi echo "Waiting for ${WAIT_FOR_NETDEV} to become operational" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30383 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib5c3bbe470ce874217437c2518df5ae07f0d8301 Gerrit-Change-Number: 30383 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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-MessageType: merged

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: fix permissions

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30434 ) Change subject: jobs/osmo-gsm-tester virtual: fix permissions ...................................................................... jobs/osmo-gsm-tester virtual: fix permissions The docker container creates the trial dir and some files inside of it as root, therefore the rm -rf trial-* line fails. Add logic to fix the permissions before attempting to remove old trial-* and when the script exits. Related: OS#5793 Change-Id: I91bd6656f33667f401247721bb34298a6c66fc62 --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 25 insertions(+), 2 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/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 9a57ead..688da38 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -218,12 +218,35 @@ - timed: "H 22 * * *" builders: - shell: | - # make sure no test results/bin artifacts from a previous run remain - rm -rf trial-* *.tgz *.md5 + # make sure no bin artifacts from a previous run remain + rm -rf *.tgz *.md5 - copy_artifact_all - copy_artifact: repo: osmo-gsm-tester_build-osmocom-bb - shell: | + # Set a trap to fix workspace permissions on exit + fix_permissions() { + docker run --rm \ + -v "$WORKSPACE":/workspace \ + debian:bullseye \ + chmod -R a+rwX /workspace/ + } + fix_permissions_trap() { + set +x + echo + echo "### Clean up ###" + echo + set -x + + trap - EXIT INT TERM 0 + fix_permissions + } + trap fix_permissions_trap EXIT INT TERM 0 + + # Make sure no test results from a previous run remain + fix_permissions + rm -rf trial-* + # Build the docker image rm -rf docker-playground git clone \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I91bd6656f33667f401247721bb34298a6c66fc62 Gerrit-Change-Number: 30434 Gerrit-PatchSet: 2 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

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: fix permissions

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30434 ) Change subject: jobs/osmo-gsm-tester virtual: fix permissions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I91bd6656f33667f401247721bb34298a6c66fc62 Gerrit-Change-Number: 30434 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-Comment-Date: Fri, 02 Dec 2022 10:51:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: fix permissions

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30434 ) Change subject: jobs/osmo-gsm-tester virtual: fix permissions ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I91bd6656f33667f401247721bb34298a6c66fc62 Gerrit-Change-Number: 30434 Gerrit-PatchSet: 2 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: Fri, 02 Dec 2022 10:20:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: gsm_forward_mncc(): call mncc_sock_from_cc() directly

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30400 ) Change subject: mobile: gsm_forward_mncc(): call mncc_sock_from_cc() directly ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I29305866e61a0bc3bd082108af6a9ba8ff86bcf2 Gerrit-Change-Number: 30400 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Dec 2022 10:19:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: repo-install-test: fix with cgroups2 on host

by osmith

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30433 ) Change subject: repo-install-test: fix with cgroups2 on host ...................................................................... Abandoned still wip, meant to only submit the other patch -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7d2a93756f807301ee77d14d1a5e67d2e1262448 Gerrit-Change-Number: 30433 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: abandon

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: repo-install-test: fix with cgroups2 on host

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30433 ) Change subject: repo-install-test: fix with cgroups2 on host ...................................................................... repo-install-test: fix with cgroups2 on host On hosts newer than debian 9, starting systemd inside docker failed with: Failed to create /init.scope control group: Read-only file system Failed to allocate manager object: Read-only file system [!!!!!!] Failed to allocate manager object. This is because /sys/fs/cgroup was mounted inside the docker container, and once the host has cgroup v2 systemd tries to write to it and fails. Adjust the docker run command so it works with cgroup v2 and we can run repo-install-test on hosts with higher debian versions. Related: OS#5685 Related: https://serverfault.com/a/1087467 Change-Id: I7d2a93756f807301ee77d14d1a5e67d2e1262448 --- M scripts/repo-install-test.sh 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/33/30433/1 diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh index 2a3e739..5787b84 100755 --- a/scripts/repo-install-test.sh +++ b/scripts/repo-install-test.sh @@ -101,7 +101,9 @@ --tmpfs /run \ --tmpfs /run/lock \ --tmpfs /tmp \ - -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ + --cgroup-parent=docker.slice \ + --cgroupns private \ + --privileged \ --cap-add SYS_ADMIN \ --cap-add SYS_NICE \ $args \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30433 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7d2a93756f807301ee77d14d1a5e67d2e1262448 Gerrit-Change-Number: 30433 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: fix permissions

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30434 ) Change subject: jobs/osmo-gsm-tester virtual: fix permissions ...................................................................... jobs/osmo-gsm-tester virtual: fix permissions The docker container creates the trial dir and some files inside of it as root, therefore the rm -rf trial-* line fails. Add logic to fix the permissions before attempting to remove old trial-* and when the script exits. Related: OS#5793 Change-Id: I91bd6656f33667f401247721bb34298a6c66fc62 --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 25 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/34/30434/1 diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 9a57ead..688da38 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -218,12 +218,35 @@ - timed: "H 22 * * *" builders: - shell: | - # make sure no test results/bin artifacts from a previous run remain - rm -rf trial-* *.tgz *.md5 + # make sure no bin artifacts from a previous run remain + rm -rf *.tgz *.md5 - copy_artifact_all - copy_artifact: repo: osmo-gsm-tester_build-osmocom-bb - shell: | + # Set a trap to fix workspace permissions on exit + fix_permissions() { + docker run --rm \ + -v "$WORKSPACE":/workspace \ + debian:bullseye \ + chmod -R a+rwX /workspace/ + } + fix_permissions_trap() { + set +x + echo + echo "### Clean up ###" + echo + set -x + + trap - EXIT INT TERM 0 + fix_permissions + } + trap fix_permissions_trap EXIT INT TERM 0 + + # Make sure no test results from a previous run remain + fix_permissions + rm -rf trial-* + # Build the docker image rm -rf docker-playground git clone \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I91bd6656f33667f401247721bb34298a6c66fc62 Gerrit-Change-Number: 30434 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: pcu: TC_cs_max_dl: Fix race condition waiting for first DL data after...

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30371 ) Change subject: pcu: TC_cs_max_dl: Fix race condition waiting for first DL data after X2002 ...................................................................... Patch Set 2: Code-Review-1 (1 comment) File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30371/comment/3f5c556e_d7f4… PS2, Line 1094: for (i := 0; i < 10; i := i + 1) { : f_rx_rlcmac_dl_block(dl_block, fn); : : if (not match(dl_block, tr_RLCMAC_DL_DUMMY_CTRL)) { : /* Received first data, starting processing: */ : break; : } : } > I thought about it, but decided to do it this way to avoid encapsulating more stuff, since in the en […] Agreeing with Harald. Let's better avoid code duplication. The function can simply accept an out parameter, which will be holding the first non-dummy block. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30371 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: If7121473a3580b40d3a658dc38b9bb1421196127 Gerrit-Change-Number: 30371 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Dec 2022 02:56:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmocom-bb[master]: mobile: gsm_forward_mncc(): call mncc_sock_from_cc() directly

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30400 ) Change subject: mobile: gsm_forward_mncc(): call mncc_sock_from_cc() directly ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > what's the point of having a function pointer if you hardcode (or you know you can hardcode) a speci […] The function pointer (ms->mncc_entity.mncc_recv) is generally used for passing Call Control messages to whatever CC entity (dummy/internal/external) the user has selected in the mobile.cfg. This is still the case even with this patch applied. However the external CC approach is a bit special in a way that you can not only pass the signalling CC messages, but also the actual voice frames. This is not the case on the network side anymore, where osmo-msc is simply bridging RTP streams (via osmo-mgw) and not receiving the actual TCH voice frames directly. But this was possible in osmo-nitb, and is possible in osmocom-bb/mobile. Given that it's only possible with an external MNCC app, I believe it's fine calling the respective function directly for TCH frames here. For CC signalling we're still using ms->mncc_entity.mncc_recv. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I29305866e61a0bc3bd082108af6a9ba8ff86bcf2 Gerrit-Change-Number: 30400 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Dec 2022 01:40:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: WIP: ns: Add test for SNS Size Num. of NSVCs IE

by arehbein

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30432 ) Change subject: WIP: ns: Add test for SNS Size Num. of NSVCs IE ...................................................................... WIP: ns: Add test for SNS Size Num. of NSVCs IE Related: OS#5208 Change-Id: Ic69c461cdb854a1b7abd27c56d70c3cbe32e6eb7 --- M ns/NS_Tests.ttcn 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/30432/1 diff --git a/ns/NS_Tests.ttcn b/ns/NS_Tests.ttcn index 64ab5dc..a87058b 100644 --- a/ns/NS_Tests.ttcn +++ b/ns/NS_Tests.ttcn @@ -640,6 +640,31 @@ f_clean_ns_codec(); } +testcase TC_sns_sgsn_sns_size_outgoing_invalid_num_of_nsvcs() runs on RAW_Test_CT { + f_init_vty(); + f_init_ns_codec(mp_nsconfig); + /* Assumption: No connections to other NSEs for SUT and testcomponent */ + const integer sgsn_ip4_endpoints := lengthof(mp_nsconfig.nsvc); + const integer ip4_endpoints := lengthof(mp_nsconfig.nsvc); + const integer num_of_nsvcs := sgsn_ip4_endpoints * ip4_endpoints; + const integer IDX := 0; + /* Template that would be accepted, only missing the number of IP endpoints + * (since there are no ternary operators in TTCN-3...) */ + var template (omit) PDU_NS ts_base_SNS_SIZE_configured := + ts_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := num_of_nsvcs, + num_v4 := omit, num_v6 := omit); + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[IDX]; + ts_base_SNS_SIZE_configured.pDU_SNS_Size.nSEI_NS := ts_NS_IE_NSEI(g_nsconfig.nsei); + f_set_num_of_ip_endpoints(ts_base_SNS_SIZE_configured, g_nsconfig.nsvc[0].provider.ip.address_family); + /* Assumption: No connections to other NSEs for SUT and testcomponent and thus no other endpoints */ + const integer required_max_num_of_nsvcs := num_of_nsvcs; + const uint16_t invalid_max_num_of_nsvcs := required_max_num_of_nsvcs - 1; + ts_base_SNS_SIZE_configured.pDU_SNS_Size.maxNumberOfNSVCs := ts_SNS_IE_MaxNumOfNSVCs(invalid_max_num_of_nsvcs); + const NsCause cause := NS_CAUSE_INVALID_NR_OF_NSVCS; + f_send_expect(IDX, ts_base_SNS_SIZE_configured, cause); + f_clean_ns_codec(); +} + testcase TC_sns_bss_config_success() runs on RAW_Test_CT { f_init_vty(); f_init_ns_codec(mp_nsconfig); @@ -1181,6 +1206,7 @@ execute( TC_sns_sgsn_size_after_success() ); execute( TC_sns_sgsn_sns_size_syntactically_wrong_NSEI() ); execute( TC_sns_sgsn_sns_size_invalid_num_of_ip_eps() ); + execute( TC_sns_sgsn_sns_size_outgoing_invalid_num_of_nsvcs() ); } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30432 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: Ic69c461cdb854a1b7abd27c56d70c3cbe32e6eb7 Gerrit-Change-Number: 30432 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: WIP: ns: Add test for SNS Size NSEI IE

by arehbein

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30430 ) Change subject: WIP: ns: Add test for SNS Size NSEI IE ...................................................................... WIP: ns: Add test for SNS Size NSEI IE Related: OS#5208 Change-Id: I3584b7b048031c798cee9566c4cc8694bf6002ac --- M ns/NS_Tests.ttcn 1 file changed, 51 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/30430/1 diff --git a/ns/NS_Tests.ttcn b/ns/NS_Tests.ttcn index 722f8ec..3ebdbf3 100644 --- a/ns/NS_Tests.ttcn +++ b/ns/NS_Tests.ttcn @@ -67,6 +67,9 @@ } } }; + NsIEI ns_iei_num_ipv4_ep := NS_IEI_NUM_IPv4_EP; + NsIEI ns_iei_num_ipv6_ep := NS_IEI_NUM_IPv6_EP; + NsIEI ns_iei_nsei := NS_IEI_NSEI; } type component RAW_Test_CT extends RAW_NS_CT { @@ -559,6 +562,53 @@ /* 48.016 SNS test cases */ /* do a succesful SNS configuration */ +function f_send_expect(in integer NSCP_IDX, in template (omit) PDU_NS pdu, + in NsCause c) runs on RAW_Test_CT { + log("Expected cause: ", c); + NSCP[NSCP_IDX].send(pdu); + f_ns_exp(tr_SNS_SIZE_ACK(g_nsconfig.nsei, c), NSCP_IDX); +} + +function f_set_num_of_ip_endpoints(inout template (omit) PDU_NS base, AddressFamily af) runs on RAW_Test_CT { + const integer NUM_IP := 1; + if (af == AF_INET) { + base.pDU_SNS_Size.numberOfIP4_Endpoints := + {iEI := int2oct(enum2int(ns_iei_num_ipv4_ep), 1), + numberOfIP_Endpoints := int2oct(NUM_IP, 2)}; + } else { + base.pDU_SNS_Size.numberOfIP4_Endpoints := + {iEI := int2oct(enum2int(ns_iei_num_ipv6_ep), 1), + numberOfIP_Endpoints := int2oct(NUM_IP, 2)}; + } +} + +/* Send SNS Size PDUs with invalid IEs */ +testcase TC_sns_sgsn_sns_size_syntactically_wrong_NSEI() runs on RAW_Test_CT { + f_init_vty(); + f_init_ns_codec(mp_nsconfig); + const integer IDX := 0; + /* Assumption: No connections to other NSEs for SUT and testcomponent */ + const integer sgsn_ip4_endpoints := lengthof(mp_nsconfig.nsvc); + const integer ip4_endpoints := lengthof(mp_nsconfig.nsvc); + const integer num_of_nsvcs := sgsn_ip4_endpoints * ip4_endpoints; + /* Template that would be accepted, only missing the number of IP endpoints + * (since there are no ternary operators in TTCN-3...) */ + var template (omit) PDU_NS ts_base_SNS_SIZE_configured := + ts_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := num_of_nsvcs, + num_v4 := omit, num_v6 := omit); + var NSVCConfiguration nsvc_cfg := g_nsconfig.nsvc[IDX]; + + f_set_num_of_ip_endpoints(ts_base_SNS_SIZE_configured, g_nsconfig.nsvc[0].provider.ip.address_family); + /* Syntactical error here: length of 1 (has to be >=2) */ + ts_base_SNS_SIZE_configured.pDU_SNS_Size.nSEI_NS := + {iEI := int2oct(enum2int(ns_iei_nsei), 1), ext := '0'B, lengthIndicator := {length1 := 1}, + nSEI := int2oct(g_nsconfig.nsei, 2)}; + const NsCause cause := NS_CAUSE_INVALID_ESSENTIAL_IE; + f_send_expect(IDX, ts_base_SNS_SIZE_configured, cause); + setverdict(pass); + f_clean_ns_codec(); +} + testcase TC_sns_bss_config_success() runs on RAW_Test_CT { f_init_vty(); f_init_ns_codec(mp_nsconfig); @@ -1098,6 +1148,7 @@ execute( TC_sns_sgsn_add_change_del() ); execute( TC_sns_sgsn_size_correct_port() ); execute( TC_sns_sgsn_size_after_success() ); + execute( TC_sns_sgsn_sns_size_syntactically_wrong_NSEI() ); } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30430 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: I3584b7b048031c798cee9566c4cc8694bf6002ac Gerrit-Change-Number: 30430 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: WIP: ns: Add test for SNS Size Num. of IP Endpoints IE

by arehbein

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30431 ) Change subject: WIP: ns: Add test for SNS Size Num. of IP Endpoints IE ...................................................................... WIP: ns: Add test for SNS Size Num. of IP Endpoints IE Related: OS#5208 Change-Id: I85c2dc201ba485d7bfdcc70e1a5f8a890023c435 --- M ns/NS_Tests.ttcn 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/30431/1 diff --git a/ns/NS_Tests.ttcn b/ns/NS_Tests.ttcn index 3ebdbf3..64ab5dc 100644 --- a/ns/NS_Tests.ttcn +++ b/ns/NS_Tests.ttcn @@ -609,6 +609,37 @@ f_clean_ns_codec(); } +testcase TC_sns_sgsn_sns_size_invalid_num_of_ip_eps() runs on RAW_Test_CT { + f_init_vty(); + f_init_ns_codec(mp_nsconfig); + const integer IDX := 0; + const integer NUM_IP := 1; + log("f_outgoing_sns_size_invalid_num_of_ip_eps(idx=", IDX, ")"); + var NsCause cause; + /* Assumption: No connections to other NSEs for SUT and testcomponent */ + const integer sgsn_ip4_endpoints := lengthof(mp_nsconfig.nsvc); + const integer ip4_endpoints := lengthof(mp_nsconfig.nsvc); + const integer num_of_nsvcs := sgsn_ip4_endpoints * ip4_endpoints; + /* Template that would be accepted, only missing the number of IP endpoints + * (since there are no ternary operators in TTCN-3...) */ + var template (omit) PDU_NS ts_base_SNS_SIZE_configured := + ts_SNS_SIZE(g_nsconfig.nsei, rst_flag := true, max_nsvcs := num_of_nsvcs, + num_v4 := omit, num_v6 := omit); + /* Send IP4 endpoints when IP6 is configured and vice versa, in effect sending an unsupported type of NS-VC endpoints. */ + if (g_nsconfig.nsvc[0].provider.ip.address_family == AF_INET) { + ts_base_SNS_SIZE_configured.pDU_SNS_Size.numberOfIP6_Endpoints := + {iEI := int2oct(enum2int(ns_iei_num_ipv6_ep), 1), numberOfIP_Endpoints := int2oct(NUM_IP, 2)}; + cause := NS_CAUSE_INVALID_NR_OF_IPv6_ENDPOINTS; + } else { + ts_base_SNS_SIZE_configured.pDU_SNS_Size.numberOfIP4_Endpoints := + {iEI := int2oct(enum2int(ns_iei_num_ipv4_ep), 1), numberOfIP_Endpoints := int2oct(NUM_IP, 2)}; + cause := NS_CAUSE_INVALID_NR_OF_IPv4_ENDPOINTS; + } + f_send_expect(IDX, ts_base_SNS_SIZE_configured, cause); + setverdict(pass); + f_clean_ns_codec(); +} + testcase TC_sns_bss_config_success() runs on RAW_Test_CT { f_init_vty(); f_init_ns_codec(mp_nsconfig); @@ -1149,6 +1180,7 @@ execute( TC_sns_sgsn_size_correct_port() ); execute( TC_sns_sgsn_size_after_success() ); execute( TC_sns_sgsn_sns_size_syntactically_wrong_NSEI() ); + execute( TC_sns_sgsn_sns_size_invalid_num_of_ip_eps() ); } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30431 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: I85c2dc201ba485d7bfdcc70e1a5f8a890023c435 Gerrit-Change-Number: 30431 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: fix docker img

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30425 ) Change subject: jobs/osmo-gsm-tester virtual: fix docker img ...................................................................... jobs/osmo-gsm-tester virtual: fix docker img Build the docker image right before using it, instead of building it in another jenkins job update-osmo-ci-on-slaves via osmo-ci-docker-rebuild.sh. The logic in osmo-ci-docker-rebuild.sh was broken. I didn't realize at the time that this image is only used for the virtual osmo-gsm-tester, not the physical ones. But only the machines running the physical osmo-gsm-tester have the /var/tmp/osmo-gsm-tester/state path. The virtual osmo-gsm-tester isn't running on these machines but on generic jenkins nodes. Building the image right before using it makes sense for this job, as it is the only user of the image. If it was already built from the same Dockerfile, a cached version is used. Fix for: Unable to find image 'osmocom-build/osmo-gsm-tester:latest' locally Fixes: 9139e76b ("osmo-ci-docker-rebuild: don't always build osmo-gsm-tester") Change-Id: Icad9459de1d3a3a4e65ecacf7f903433bb504cc9 --- M jobs/osmo-gsm-tester-runner.yml M scripts/osmo-ci-docker-rebuild.sh 2 files changed, 14 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/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index bff2a9b..814c0c9 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -224,6 +224,16 @@ - copy_artifact: repo: osmo-gsm-tester_build-osmocom-bb - shell: | + # Build the docker image + rm -rf docker-playground + git clone \ + --depth=1 \ + --branch="$DOCKER_PLAYGROUND_BRANCH" \ + https://gerrit.osmocom.org/docker-playground \ + docker-playground + git -C docker-playground log --oneline + make -C docker-playground/osmo-gsm-tester + unlink osmo-gsm-tester/sysmocom/resources.conf || true ln -s resources.conf.virtual osmo-gsm-tester/sysmocom/resources.conf @@ -260,3 +270,7 @@ name: "OSMO_GSM_TESTER_BRANCH" default: "master" description: "Which branch/sha should be used for testing" + - string: + name: "DOCKER_PLAYGROUND_BRANCH" + default: "master" + description: "Which branch/sha should be used for building the osmo-gsm-tester docker container" diff --git a/scripts/osmo-ci-docker-rebuild.sh b/scripts/osmo-ci-docker-rebuild.sh index 9c2aae6..f409d45 100755 --- a/scripts/osmo-ci-docker-rebuild.sh +++ b/scripts/osmo-ci-docker-rebuild.sh @@ -10,8 +10,3 @@ "debian-bullseye-erlang" \ "debian-bullseye-jenkins" fi - -if [ -d "/var/tmp/osmo-gsm-tester/state" ]; then - docker_images_require \ - "osmo-gsm-tester" -fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icad9459de1d3a3a4e65ecacf7f903433bb504cc9 Gerrit-Change-Number: 30425 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: fix opts desciption

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30427 ) Change subject: jobs/osmo-gsm-tester virtual: fix opts desciption ...................................................................... jobs/osmo-gsm-tester virtual: fix opts desciption The default value is what it says in the line above, not empty. Change-Id: I5ce8a47b43525dcca6bf54184a48f11b0c87c19e --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 739bb61..0e866ac 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -265,7 +265,7 @@ - string: name: "OSMO_GSM_TESTER_OPTS" default: "-s netreg_mass" - description: "pass additional command line options to osmo-gsm-tester.py, e.g. to select specific suites:scenarios. Default: leave empty." + description: "pass additional command line options to osmo-gsm-tester.py, e.g. to select specific suites:scenarios" - string: name: "OSMO_GSM_TESTER_BRANCH" default: "master" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5ce8a47b43525dcca6bf54184a48f11b0c87c19e Gerrit-Change-Number: 30427 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

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: don't limit to deb9

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30426 ) Change subject: jobs/osmo-gsm-tester virtual: don't limit to deb9 ...................................................................... jobs/osmo-gsm-tester virtual: don't limit to deb9 Related: OS#5793 Change-Id: I8e7ffa65b4ff6d1816ad167367b0f6ff8c00e64b --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 814c0c9..739bb61 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -211,7 +211,7 @@ - job: name: 'osmo-gsm-tester_virtual' defaults: runner - node: 'osmocom-master-debian9' + node: 'osmocom-master' scm: - 'osmo-gsm-tester-repo' triggers: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8e7ffa65b4ff6d1816ad167367b0f6ff8c00e64b Gerrit-Change-Number: 30426 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

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester: remove old test result early

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30428 ) Change subject: jobs/osmo-gsm-tester: remove old test result early ...................................................................... jobs/osmo-gsm-tester: remove old test result early The virtual osmo-gsm-tester has been failing for a long time, but the test results were still green. This was because the job failed before it removed old test results, and so those were used. Remove the old results as early as possible to prevent this in the future. Change-Id: I23f2f7b24fe41bbded2e05abbe6ea5e717b88e9e --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 0e866ac..f6692ee 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -171,8 +171,8 @@ branch-pattern: '**' builders: - shell: | - # make sure no bin artifacts from a previous run remain - rm -f *.tgz *.md5 + # make sure no test results/bin artifacts from a previous run remain + rm -rf trial-* *.tgz *.md5 - copy_artifact_all - shell: !include-raw: osmo-gsm-tester_run-gerrit.sh publishers: @@ -193,8 +193,8 @@ - timed: "H 23 * * *" builders: - shell: | - # make sure no bin artifacts from a previous run remain - rm -f *.tgz *.md5 + # make sure no test results/bin artifacts from a previous run remain + rm -rf trial-* *.tgz *.md5 - copy_artifact_all - copy_artifact: repo: osmo-gsm-tester_build-osmocom-bb @@ -218,8 +218,8 @@ - timed: "H 22 * * *" builders: - shell: | - # make sure no bin artifacts from a previous run remain - rm -f *.tgz *.md5 + # make sure no test results/bin artifacts from a previous run remain + rm -rf trial-* *.tgz *.md5 - copy_artifact_all - copy_artifact: repo: osmo-gsm-tester_build-osmocom-bb -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I23f2f7b24fe41bbded2e05abbe6ea5e717b88e9e Gerrit-Change-Number: 30428 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

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: send mails on error

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30429 ) Change subject: jobs/osmo-gsm-tester virtual: send mails on error ...................................................................... jobs/osmo-gsm-tester virtual: send mails on error Change-Id: If91644a3dfea1af259f7a511a7784cf32d8d23ea --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index f6692ee..9a57ead 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -261,6 +261,9 @@ - junit: results: 'trial-*/last_run/trial-*.xml' allow-empty-results: true + - email: + notify-every-unstable-build: true + recipients: jenkins-notifications(a)lists.osmocom.org parameters: - string: name: "OSMO_GSM_TESTER_OPTS" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If91644a3dfea1af259f7a511a7784cf32d8d23ea Gerrit-Change-Number: 30429 Gerrit-PatchSet: 2 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

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: send mails on error

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30429 ) Change subject: jobs/osmo-gsm-tester virtual: send mails on error ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If91644a3dfea1af259f7a511a7784cf32d8d23ea Gerrit-Change-Number: 30429 Gerrit-PatchSet: 2 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-Comment-Date: Thu, 01 Dec 2022 15:48:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: send mails on error

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30429 ) Change subject: jobs/osmo-gsm-tester virtual: send mails on error ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If91644a3dfea1af259f7a511a7784cf32d8d23ea Gerrit-Change-Number: 30429 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-Comment-Date: Thu, 01 Dec 2022 15:44:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester: remove old test result early

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30428 ) Change subject: jobs/osmo-gsm-tester: remove old test result early ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I23f2f7b24fe41bbded2e05abbe6ea5e717b88e9e Gerrit-Change-Number: 30428 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, 01 Dec 2022 15:43:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: fix opts desciption

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30427 ) Change subject: jobs/osmo-gsm-tester virtual: fix opts desciption ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5ce8a47b43525dcca6bf54184a48f11b0c87c19e Gerrit-Change-Number: 30427 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, 01 Dec 2022 15:43:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: don't limit to deb9

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30426 ) Change subject: jobs/osmo-gsm-tester virtual: don't limit to deb9 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30426 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8e7ffa65b4ff6d1816ad167367b0f6ff8c00e64b Gerrit-Change-Number: 30426 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, 01 Dec 2022 15:42:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: fix docker img

by fixeria

Attention is currently required from: osmith, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30425 ) Change subject: jobs/osmo-gsm-tester virtual: fix docker img ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icad9459de1d3a3a4e65ecacf7f903433bb504cc9 Gerrit-Change-Number: 30425 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 01 Dec 2022 15:42:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: send mails on error

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/30429 to look at the new patch set (#2). Change subject: jobs/osmo-gsm-tester virtual: send mails on error ...................................................................... jobs/osmo-gsm-tester virtual: send mails on error Change-Id: If91644a3dfea1af259f7a511a7784cf32d8d23ea --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/29/30429/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If91644a3dfea1af259f7a511a7784cf32d8d23ea Gerrit-Change-Number: 30429 Gerrit-PatchSet: 2 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: newpatchset

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: use literal style

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30424 ) Change subject: jobs/osmo-gsm-tester virtual: use literal style ...................................................................... jobs/osmo-gsm-tester virtual: use literal style Use literal style instead of folded style in the shell argument of osmo-gsm-tester_virtual as otherwise new lines behave unintuitively. Related: https://yaml-multiline.info/ Change-Id: I862a0ed24bae2c713e857a459797e1a978df0560 --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 9e50f6e..bff2a9b 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -223,7 +223,7 @@ - copy_artifact_all - copy_artifact: repo: osmo-gsm-tester_build-osmocom-bb - - shell: > + - shell: | unlink osmo-gsm-tester/sysmocom/resources.conf || true ln -s resources.conf.virtual osmo-gsm-tester/sysmocom/resources.conf -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I862a0ed24bae2c713e857a459797e1a978df0560 Gerrit-Change-Number: 30424 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 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester: clone from gerrit git url

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30422 ) Change subject: jobs/osmo-gsm-tester: clone from gerrit git url ...................................................................... jobs/osmo-gsm-tester: clone from gerrit git url Use the gerrit git url instead of the gitea one so we don't have a sync delay. Related: https://osmocom.org/projects/cellular-infrastructure/wiki/Git_infrastructure Change-Id: I586fdd55ded6c3776cacd6760d88aa455da22990 --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 73a49db..6b9df3e 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -32,7 +32,7 @@ name: osmo-gsm-tester-repo scm: - git: - url: https://gitea.osmocom.org/cellular-infrastructure/osmo-gsm-tester + url: https://gerrit.osmocom.org/osmo-gsm-tester branches: - ${OSMO_GSM_TESTER_BRANCH} wipe-workspace: false -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I586fdd55ded6c3776cacd6760d88aa455da22990 Gerrit-Change-Number: 30422 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 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: fix default branch

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30423 ) Change subject: jobs/osmo-gsm-tester virtual: fix default branch ...................................................................... jobs/osmo-gsm-tester virtual: fix default branch Change it to "master" instead of "origin/master" to prepare for building the docker image right before running it. The Makefile from docker-playground.git picks up the OSMO_GSM_TESTER_BRANCH environment variable and expects it to be in that format. Change-Id: I4ad1ce71fd5b5b57a65267e0be51755f7495b07d --- M jobs/osmo-gsm-tester-runner.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 6b9df3e..9e50f6e 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -258,5 +258,5 @@ description: "pass additional command line options to osmo-gsm-tester.py, e.g. to select specific suites:scenarios. Default: leave empty." - string: name: "OSMO_GSM_TESTER_BRANCH" - default: "origin/master" + default: "master" description: "Which branch/sha should be used for testing" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4ad1ce71fd5b5b57a65267e0be51755f7495b07d Gerrit-Change-Number: 30423 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 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester: remove old test result early

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30428 ) Change subject: jobs/osmo-gsm-tester: remove old test result early ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I23f2f7b24fe41bbded2e05abbe6ea5e717b88e9e Gerrit-Change-Number: 30428 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, 01 Dec 2022 15:24:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: send mails on error

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30429 ) Change subject: jobs/osmo-gsm-tester virtual: send mails on error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If91644a3dfea1af259f7a511a7784cf32d8d23ea Gerrit-Change-Number: 30429 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, 01 Dec 2022 15:24:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester: clone from gerrit git url

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30422 ) Change subject: jobs/osmo-gsm-tester: clone from gerrit git url ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I586fdd55ded6c3776cacd6760d88aa455da22990 Gerrit-Change-Number: 30422 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, 01 Dec 2022 15:24:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: use literal style

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30424 ) Change subject: jobs/osmo-gsm-tester virtual: use literal style ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30424 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I862a0ed24bae2c713e857a459797e1a978df0560 Gerrit-Change-Number: 30424 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, 01 Dec 2022 15:23:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: fix opts desciption

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30427 ) Change subject: jobs/osmo-gsm-tester virtual: fix opts desciption ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30427 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5ce8a47b43525dcca6bf54184a48f11b0c87c19e Gerrit-Change-Number: 30427 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, 01 Dec 2022 15:23:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/osmo-gsm-tester virtual: fix docker img

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30425 ) Change subject: jobs/osmo-gsm-tester virtual: fix docker img ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Icad9459de1d3a3a4e65ecacf7f903433bb504cc9 Gerrit-Change-Number: 30425 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, 01 Dec 2022 15:23:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

2024

2023

2022

gerrit-log December 2022