laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33921 )
Change subject: osmo-uecups-master: make osmocom user avilable
......................................................................
osmo-uecups-master: make osmocom user avilable
Bring back the osmocom user that was removed earlier to fix a UID
conflict with the build user.
The osmocom user is being used after all, the TTCN-3 PGW tests use it to
start commands as "osmocom" user in osmo-uecups-master. This lead to e.g.
PGW_Tests.TC_createSession_ping4 failing.
Rename the user instead of adding a new one, so it can write log files
to the log dir as the same UID as the user that runs docker.
Fixes: 94f8a8 ("osmo-uecups-master: remove useradd")
Related: OS#6057
Change-Id: I2b29d7fedcf3e0a4c17bfbad16077098f94c529b
---
M osmo-uecups-master/Dockerfile
1 file changed, 23 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
osmith: Verified
diff --git a/osmo-uecups-master/Dockerfile b/osmo-uecups-master/Dockerfile
index 7f30155..793fe6b 100644
--- a/osmo-uecups-master/Dockerfile
+++ b/osmo-uecups-master/Dockerfile
@@ -34,6 +34,8 @@
COPY osmo-uecups-daemon.cfg /data/osmo-uecups-daemon.cfg
+RUN usermod -l osmocom build
+
WORKDIR /data
CMD ["/bin/sh", "-c", "/usr/local/bin/osmo-uecups-daemon -c /data/osmo-uecups-daemon.cfg >/data/osmo-uecups-daemon.log 2>&1"]
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33921
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I2b29d7fedcf3e0a4c17bfbad16077098f94c529b
Gerrit-Change-Number: 33921
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33915 )
Change subject: ran_a_channel_type_to_speech_codec_list(): set PI/PT for CSD
......................................................................
ran_a_channel_type_to_speech_codec_list(): set PI/PT for CSD
As per 3GPP TS 48.008, section 3.2.2.103, the Codec Type is valid if
at least one of FI, PI or PT is set to '1'. Otherwise the Speech
Codec Element is considered invalid and shall be ignored.
Change-Id: Ibc452d37d4215c961a7946eef3ba2e7efdba078b
Related: OS#6110, OS#4394
---
M src/libmsc/ran_msg_a.c
1 file changed, 20 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c
index 3788805..8cf6bfa 100644
--- a/src/libmsc/ran_msg_a.c
+++ b/src/libmsc/ran_msg_a.c
@@ -1349,7 +1349,12 @@
switch (ct->ch_indctr) {
case GSM0808_CHAN_DATA:
- scl->codec[0].type = GSM0808_SCT_CSD;
+ scl->codec[0] = (struct gsm0808_speech_codec) {
+ .pi = true, /* PI indicates CSDoIP is supported */
+ .pt = false, /* PT indicates CSDoTDM is not supported */
+ .type = GSM0808_SCT_CSD,
+ .cfg = 0, /* R2/R3 not set (redundancy not supported) */
+ };
scl->len = 1;
break;
case GSM0808_CHAN_SPEECH:
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33915
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Ibc452d37d4215c961a7946eef3ba2e7efdba078b
Gerrit-Change-Number: 33915
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33916 )
Change subject: ttcn3-hnbgw: fix disabling talloc report checks for hnbgw-latest
......................................................................
ttcn3-hnbgw: fix disabling talloc report checks for hnbgw-latest
Older commit disabled the talloc report checks but forgot to add the
same line to the with-pfcp/ variant, and as a result the sed command in
jenkins.sh won't work there.
Fixes: cb4897e4c09f7213c929dfd85f1657d697e6bf3d
Change-Id: Id4eed548b3a552747e95784be3654952e10e96ab
---
M ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
1 file changed, 15 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg b/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
index 8db8134..16173de 100644
--- a/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
+++ b/ttcn3-hnbgw-test/with-pfcp/HNBGW_Tests.cfg
@@ -113,7 +113,7 @@
HNBGW_Tests.mp_enable_pfcp_tests := true;
HNBGW_Tests.mp_pfcp_ip_local := "172.18.35.203";
HNBGW_Tests.mp_pfcp_ip_remote := "172.18.35.20";
-
+HNBGW_Tests.mp_validate_talloc_asn1 := true;
[MAIN_CONTROLLER]
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33916
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Id4eed548b3a552747e95784be3654952e10e96ab
Gerrit-Change-Number: 33916
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
arehbein has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33206 )
Change subject: stream: Fix osmo_panic log fmts
......................................................................
stream: Fix osmo_panic log fmts
Change-Id: Id082a9473b788f8de20cdc2ba4430b3289f4ce5a
---
M src/stream.c
1 file changed, 14 insertions(+), 4 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/src/stream.c b/src/stream.c
index 8de6cb8..9ff1df9 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -560,8 +560,9 @@
}
break;
default:
- /* Only CONNECTING and CONNECTED states are expected, since they are the only states where FD exists: */
- osmo_panic("osmo_stream_cli_fd_cb called with unexpected state %d\n", cli->state);
+ /* Only CONNECTING and CONNECTED states are expected, since they are the only states
+ * where FD exists: */
+ osmo_panic("%s() called with unexpected state %d\n", __func__, cli->state);
}
return 0;
}
@@ -610,7 +611,7 @@
cli->iofd_read_cb(cli, msg);
break;
default:
- osmo_panic("osmo_stream_cli_write_cb() called with unexpected state %d\n", cli->state);
+ osmo_panic("%s() called with unexpected state %d\n", __func__, cli->state);
}
}
@@ -629,7 +630,7 @@
}
break;
default:
- osmo_panic("osmo_stream_cli_write_cb() called with unexpected state %d\n", cli->state);
+ osmo_panic("%s() called with unexpected state %d\n", __func__, cli->state);
}
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33206
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Change-Id: Id082a9473b788f8de20cdc2ba4430b3289f4ce5a
Gerrit-Change-Number: 33206
Gerrit-PatchSet: 11
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33918 )
Change subject: debian-bullseye-titan-*/Dockerfile: Replace inetutils-ping with iputils-ping
......................................................................
Patch Set 2:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/docker-playground/+/33918/comment/5c1857e7_fab…
PS1, Line 9: The inetutils-ping ping lacks the -I param required by ttcn3-pgw-test.
> I'd mention here that this wasn't the cause of ping failing as it's running in osmo-uecups-master in […]
Done
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33918
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If11a1c2ae1115b585b6a44a45e9569c16856d8c4
Gerrit-Change-Number: 33918
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 25 Jul 2023 14:01:45 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
Hello osmith, Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/docker-playground/+/33918
to look at the new patch set (#2).
Change subject: debian-bullseye-titan-*/Dockerfile: Replace inetutils-ping with iputils-ping
......................................................................
debian-bullseye-titan-*/Dockerfile: Replace inetutils-ping with iputils-ping
iCurrently we install inetutils-ping in some docker images and
iputils-ping in others; let's make it more uniform to avoid running
different implementations in different images.
The iputils-ping provides further linux-specific features, such as the
"-I interface" param, which is used by some images, so let's pick that
one everywhere.
Change-Id: If11a1c2ae1115b585b6a44a45e9569c16856d8c4
---
M debian-bullseye-titan-master/Dockerfile
M debian-bullseye-titan/Dockerfile
2 files changed, 18 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/18/33918/2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33918
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: If11a1c2ae1115b585b6a44a45e9569c16856d8c4
Gerrit-Change-Number: 33918
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset