October 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmocom-bb[master]: mobile: fix AUDIO_IOH_LOOPBACK mode: pull DL info header
by fixeria 16 Oct '23

16 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34757?usp=email ) Change subject: mobile: fix AUDIO_IOH_LOOPBACK mode: pull DL info header ...................................................................... mobile: fix AUDIO_IOH_LOOPBACK mode: pull DL info header The loopback mode is currently broken because the DL info header remains present, thus becoming a bogus "part" of the speech frame. Change-Id: I1af187b4bc5f5a99bc7f7634d90bf14ad3db0e49 Related: OS#4396 --- M src/host/layer23/src/mobile/voice.c 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/57/34757/1 diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c index 7d6c2e0..acc0dce 100644 --- a/src/host/layer23/src/mobile/voice.c +++ b/src/host/layer23/src/mobile/voice.c @@ -78,6 +78,8 @@ { switch (ms->settings.audio.io_handler) { case AUDIO_IOH_LOOPBACK: + /* Remove the DL info header */ + msgb_pull_to_l2(msg); /* Send voice frame back */ return gsm_send_voice_msg(ms, msg); case AUDIO_IOH_MNCC_SOCK: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34757?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1af187b4bc5f5a99bc7f7634d90bf14ad3db0e49 Gerrit-Change-Number: 34757 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmocom-bb[master]: firmware/layer1: fill-in DL info for L1CTL TRAFFIC.ind
by fixeria 16 Oct '23

16 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34755?usp=email ) Change subject: firmware/layer1: fill-in DL info for L1CTL TRAFFIC.ind ...................................................................... firmware/layer1: fill-in DL info for L1CTL TRAFFIC.ind Change-Id: I1c9727b183214f3d1a4f9a48489479f8435a4c5a Related: OS#4396 --- M src/target/firmware/layer1/prim_tch.c 1 file changed, 56 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/55/34755/1 diff --git a/src/target/firmware/layer1/prim_tch.c b/src/target/firmware/layer1/prim_tch.c index 337b37a..71ec077 100644 --- a/src/target/firmware/layer1/prim_tch.c +++ b/src/target/firmware/layer1/prim_tch.c @@ -156,14 +156,30 @@ #define FACCH_MEAS_HIST 8 /* Up to 8 bursts history */ struct l1s_rx_tch_state { struct l1s_meas_hdr meas[FACCH_MEAS_HIST]; + uint8_t meas_id; }; static struct l1s_rx_tch_state rx_tch; +static inline void l1s_tch_meas_avg(struct l1ctl_info_dl *dl, + unsigned int meas_num) +{ + uint32_t avg_snr = 0; + int32_t avg_dbm8 = 0; + + for (unsigned int i = 0; i < meas_num; i++) { + int j = (rx_tch.meas_id + FACCH_MEAS_HIST - i) % FACCH_MEAS_HIST; + avg_snr += rx_tch.meas[j].snr; + avg_dbm8 += rx_tch.meas[j].pm_dbm8; + } + + dl->snr = avg_snr / meas_num; + dl->rx_level = dbm2rxlev(avg_dbm8 / (8 * meas_num)); +} + static int l1s_tch_resp(__unused uint8_t p1, __unused uint8_t p2, uint16_t p3) { - static uint8_t meas_id = 0; uint8_t mf_task_id = p3 & 0xff; struct gsm_time rx_time; uint8_t chan_nr; @@ -179,27 +195,27 @@ chan_nr = mframe_task2chan_nr(mf_task_id, tn); tch_get_params(&rx_time, chan_nr, &fn_report, &tch_f_hn, &tch_sub, NULL); - meas_id = (meas_id + 1) % FACCH_MEAS_HIST; /* absolute value doesn't matter */ + rx_tch.meas_id = (rx_tch.meas_id + 1) % FACCH_MEAS_HIST; /* absolute value doesn't matter */ /* Collect measurements */ - rx_tch.meas[meas_id].toa_qbit = dsp_api.db_r->a_serv_demod[D_TOA]; - rx_tch.meas[meas_id].pm_dbm8 = + rx_tch.meas[rx_tch.meas_id].toa_qbit = dsp_api.db_r->a_serv_demod[D_TOA]; + rx_tch.meas[rx_tch.meas_id].pm_dbm8 = agc_inp_dbm8_by_pm(dsp_api.db_r->a_serv_demod[D_PM] >> 3); - rx_tch.meas[meas_id].freq_err = + rx_tch.meas[rx_tch.meas_id].freq_err = ANGLE_TO_FREQ(dsp_api.db_r->a_serv_demod[D_ANGLE]); - rx_tch.meas[meas_id].snr = dsp_api.db_r->a_serv_demod[D_SNR]; + rx_tch.meas[rx_tch.meas_id].snr = dsp_api.db_r->a_serv_demod[D_SNR]; /* feed computed frequency error into AFC loop */ - if (rx_tch.meas[meas_id].snr > AFC_SNR_THRESHOLD) - afc_input(rx_tch.meas[meas_id].freq_err, arfcn, 1); + if (rx_tch.meas[rx_tch.meas_id].snr > AFC_SNR_THRESHOLD) + afc_input(rx_tch.meas[rx_tch.meas_id].freq_err, arfcn, 1); else - afc_input(rx_tch.meas[meas_id].freq_err, arfcn, 0); + afc_input(rx_tch.meas[rx_tch.meas_id].freq_err, arfcn, 0); /* feed computed TOA into TA loop */ - toa_input(rx_tch.meas[meas_id].toa_qbit << 2, rx_tch.meas[meas_id].snr); + toa_input(rx_tch.meas[rx_tch.meas_id].toa_qbit << 2, rx_tch.meas[rx_tch.meas_id].snr); /* Tell the RF frontend to set the gain appropriately */ - rffe_compute_gain(rx_tch.meas[meas_id].pm_dbm8 / 8, + rffe_compute_gain(rx_tch.meas[rx_tch.meas_id].pm_dbm8 / 8, CAL_DSP_TGT_BB_LVL); /* FACCH Block end ? */ @@ -219,9 +235,6 @@ struct l1ctl_info_dl *dl; struct l1ctl_data_ind *di; uint16_t num_biterr; - uint32_t avg_snr = 0; - int32_t avg_dbm8 = 0; - int i, n; /* Allocate msgb */ /* FIXME: we actually want all allocation out of L1S! */ @@ -241,15 +254,7 @@ dl->frame_nr = htonl(rx_time.fn); /* Average SNR & RX level */ - n = tch_f_hn ? 8 : 6; - for (i=0; i<n; i++) { - int j = (meas_id + FACCH_MEAS_HIST - i) % FACCH_MEAS_HIST; - avg_snr += rx_tch.meas[j].snr; - avg_dbm8 += rx_tch.meas[j].pm_dbm8; - } - - dl->snr = avg_snr / n; - dl->rx_level = dbm2rxlev(avg_dbm8 / (8*n)); + l1s_tch_meas_avg(dl, tch_f_hn ? 8 : 6); /* Errors & CRC status */ num_biterr = dsp_api.ndb->a_fd[2] & 0xffff; @@ -299,6 +304,7 @@ struct l1ctl_info_dl *dl; struct l1ctl_traffic_ind *ti; struct msgb *msg; + uint16_t num_biterr; traffic_buf = tch_sub ? dsp_api.ndb->a_dd_1 : dsp_api.ndb->a_dd_0; @@ -321,6 +327,23 @@ dl = (struct l1ctl_info_dl *) msgb_put(msg, sizeof(*dl)); ti = (struct l1ctl_traffic_ind *) msgb_put(msg, sizeof(*ti)); + dl->chan_nr = chan_nr; + dl->band_arfcn = htons(arfcn); + dl->frame_nr = htonl(rx_time.fn); + + /* Average SNR & RX level */ + l1s_tch_meas_avg(dl, tch_f_hn ? 8 : 4); + + /* Errors & CRC status */ + num_biterr = traffic_buf[2] & 0xffff; + if (num_biterr > 0xff) + dl->num_biterr = 0xff; + else + dl->num_biterr = num_biterr; + + /* Update rx level for pm report */ + pu_update_rx_level(dl->rx_level); + /* Copy actual data, skipping the information block [0,1,2] */ dsp_memcpy_from_api(msgb_put(msg, 33), &traffic_buf[3], 33, 1); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34755?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1c9727b183214f3d1a4f9a48489479f8435a4c5a Gerrit-Change-Number: 34755 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: mobile: mncc_recv_internal(): make struct gsm_mncc ptr const
by fixeria 16 Oct '23

16 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34758?usp=email ) Change subject: mobile: mncc_recv_internal(): make struct gsm_mncc ptr const ...................................................................... mobile: mncc_recv_internal(): make struct gsm_mncc ptr const Change-Id: I0a5522b7df112bfaefc684c872a618c1e9118e61 --- M src/host/layer23/src/mobile/mnccms.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/58/34758/1 diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 60d2e55..d8a4421 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -258,7 +258,7 @@ int mncc_recv_internal(struct osmocom_ms *ms, int msg_type, void *arg) { struct gsm_settings *set = &ms->settings; - struct gsm_mncc *data = arg; + const struct gsm_mncc *data = arg; struct gsm_call *call = get_call_ref(data->callref); struct gsm_mncc mncc; uint8_t cause; @@ -727,7 +727,8 @@ * DTMF */ -static int dtmf_statemachine(struct gsm_call *call, struct gsm_mncc *mncc) +static int dtmf_statemachine(struct gsm_call *call, + const struct gsm_mncc *mncc) { struct osmocom_ms *ms = call->ms; struct gsm_mncc dtmf; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34758?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0a5522b7df112bfaefc684c872a618c1e9118e61 Gerrit-Change-Number: 34758 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: mobile: mncc_call(): make *number argument const
by fixeria 16 Oct '23

16 Oct '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34759?usp=email ) Change subject: mobile: mncc_call(): make *number argument const ...................................................................... mobile: mncc_call(): make *number argument const Change-Id: I4558ce1313b8e9aadd73474a6514c136aa512de3 --- M src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/59/34759/1 diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h index 49ce1a4..705c681 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc_ms.h @@ -1,6 +1,6 @@ #pragma once -int mncc_call(struct osmocom_ms *ms, char *number); +int mncc_call(struct osmocom_ms *ms, const char *number); int mncc_hangup(struct osmocom_ms *ms); int mncc_answer(struct osmocom_ms *ms); int mncc_hold(struct osmocom_ms *ms); diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index d8a4421..c269ab4 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -532,7 +532,7 @@ return 0; } -int mncc_call(struct osmocom_ms *ms, char *number) +int mncc_call(struct osmocom_ms *ms, const char *number) { struct gsm_call *call; struct gsm_mncc setup; diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 2a09608..ea355b3 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -497,7 +497,7 @@ struct osmocom_ms *ms; struct gsm_settings *set; struct gsm_settings_abbrev *abbrev; - char *number; + const char *number; ms = l23_vty_get_ms(argv[0], vty); if (!ms) @@ -510,7 +510,7 @@ return CMD_WARNING; } - number = (char *)argv[1]; + number = argv[1]; if (!strcmp(number, "emergency")) mncc_call(ms, number); else if (!strcmp(number, "answer")) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34759?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I4558ce1313b8e9aadd73474a6514c136aa512de3 Gerrit-Change-Number: 34759 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: osmo_io: Add possibility to resend a message
by arehbein 15 Oct '23

15 Oct '23

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/34750?usp=email ) Change subject: osmo_io: Add possibility to resend a message ...................................................................... osmo_io: Add possibility to resend a message Add osmo_iofd_rewrite_msgb(), which works like osmo_iofd_write_msgb(), except it doesn't check the message queue length and it enqueues at the front of the message queue. Change-Id: I9cc588294fcaee49e334282183672aa32fa30bee --- M TODO-RELEASE M include/osmocom/core/osmo_io.h M src/core/libosmocore.map M src/core/osmo_io.c 4 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/50/34750/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index b67161d..2945c2b 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line core ADD osmo_sock_multiaddr_{add,del}_local_addr() core ADD gsmtap_inst_fd2() core, DEPRECATE gsmtap_inst_fd() +core ADD osmo_iofd_rewrite_msgb() diff --git a/include/osmocom/core/osmo_io.h b/include/osmocom/core/osmo_io.h index b3d248f..23335ff 100644 --- a/include/osmocom/core/osmo_io.h +++ b/include/osmocom/core/osmo_io.h @@ -83,6 +83,7 @@ void osmo_iofd_notify_connected(struct osmo_io_fd *iofd); int osmo_iofd_write_msgb(struct osmo_io_fd *iofd, struct msgb *msg); +int osmo_iofd_rewrite_msgb(struct osmo_io_fd *iofd, struct msgb *msg); int osmo_iofd_sendto_msgb(struct osmo_io_fd *iofd, struct msgb *msg, int sendto_flags, const struct osmo_sockaddr *dest); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index e5f8bd8..6d04d34 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -278,6 +278,7 @@ osmo_iofd_uring_init; osmo_iofd_notify_connected; osmo_iofd_write_msgb; +osmo_iofd_rewrite_msgb; osmo_ip_str_type; osmo_isdnhdlc_decode; osmo_isdnhdlc_encode; diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 2b2b7dd..894a0c1 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -381,6 +381,38 @@ return 0; } +/*! Resend a message through a connected socket. + * + * Appends the message to the front of the internal transmit queue. This function + * will always enqueue the message, even if the maximum number of messages is reached. + * This can be used to emulate Osmocom write queue API behavior (with write queues, + * if the call to the write callback returns -EAGAIN, the message buffer that failed + * to be sent is enqueued at the front of the write queue by the write queue backend). + * \param[in] iofd file descriptor to write to + * \param[in] msg message buffer to write + */ +int osmo_iofd_rewrite_msgb(struct osmo_io_fd *iofd, struct msgb *msg) +{ + if (OSMO_UNLIKELY(!iofd->io_ops.write_cb)) { + LOGPIO(iofd, LOGL_ERROR, "write_cb not set, Rejecting msgb\n"); + return -EINVAL; + } + + struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_WRITE, msg); + if (!msghdr) + return -ENOMEM; + + msghdr->flags = MSG_NOSIGNAL; + msghdr->iov[0].iov_base = msgb_data(msghdr->msg); + msghdr->iov[0].iov_len = msgb_length(msghdr->msg); + msghdr->hdr.msg_iov = &msghdr->iov[0]; + msghdr->hdr.msg_iovlen = 1; + + iofd_txqueue_enqueue_front(iofd, msghdr); + + return 0; +} + /*! Send a message through an unconnected socket. * * Appends the message to the internal transmit queue. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34750?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9cc588294fcaee49e334282183672aa32fa30bee Gerrit-Change-Number: 34750 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmocore[master]: gsmtap: Hide implementation of gsmtap_inst
by pespin 15 Oct '23

15 Oct '23

Attention is currently required from: arehbein, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34720?usp=email ) Change subject: gsmtap: Hide implementation of gsmtap_inst ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibe1a51205a6df764571b6d074e365825555609a5 Gerrit-Change-Number: 34720 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sun, 15 Oct 2023 21:54:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-hss-test-ogs: Adapt mongodb db setup to pass new test
by pespin 15 Oct '23

15 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34719?usp=email ) Change subject: ttcn3-hss-test-ogs: Adapt mongodb db setup to pass new test ...................................................................... ttcn3-hss-test-ogs: Adapt mongodb db setup to pass new test Add DB config for new subscriber required by TC_ulr_ula_subscr_op_det_barring_7. Depends: osmo-ttcn3-hacks.git I8deea9e284447f8991bdeced982c14fae2f211c5 Related: SYS#6588 Change-Id: I42d6af42bada50c55914ec94c4090fccbe8d1c97 --- M ttcn3-hss-test-ogs/jenkins.sh 1 file changed, 27 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ttcn3-hss-test-ogs/jenkins.sh b/ttcn3-hss-test-ogs/jenkins.sh index 5ca59a9..0eacaf9 100755 --- a/ttcn3-hss-test-ogs/jenkins.sh +++ b/ttcn3-hss-test-ogs/jenkins.sh @@ -24,6 +24,9 @@ network_create network_replace_subnet_in_configs +MONGOD_ADDR="172.18.$SUBNET.103" +DBCTL="open5gs-dbctl --db_uri=mongodb://$MONGOD_ADDR/open5gs" + # start container with mongod in background docker run --rm --user $(id -u) \ $(docker_network_params $SUBNET 103) \ @@ -35,16 +38,22 @@ /bin/sh -c "mongod -f /data/mongod.conf >/data/mongod.out 2>&1" # mongod needs some time to bootstrap... -while ! nc -z 172.18.$SUBNET.103 27017; do sleep 1; done +while ! nc -z $MONGOD_ADDR 27017; do sleep 1; done # create a test subscriber with IMSI=001010000000000 docker run --rm \ $(docker_network_params $SUBNET 8) \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - open5gs-dbctl --db_uri=mongodb://172.18.$SUBNET.103/open5gs \ - add 001010000000000 \ - 3c6e0b8a9c15224a8228b9a98ca1531d \ - 762a2206fe0b4151ace403c86a11e479 + $DBCTL add 001010000000000 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 + +# Mark test subscriber with IMSI=001010000000001 as: +# Subscriber-Status=OPERATOR_DETERMINED_BARRING (1) +# Operator-Determined-Barring="Barring of all outgoing inter-zonal calls except those directed to the home PLMN country" (7) +docker run --rm \ + $(docker_network_params $SUBNET 8) \ + $REPO_USER/open5gs-$IMAGE_SUFFIX \ + /bin/sh -c "$DBCTL add 001010000000001 3c6e0b8a9c15224a8228b9a98ca1531d 762a2206fe0b4151ace403c86a11e479 && + $DBCTL subscriber_status 001010000000001 1 7" # start container with hss in background docker run --sysctl net.ipv6.conf.all.disable_ipv6=0 \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34719?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I42d6af42bada50c55914ec94c4090fccbe8d1c97 Gerrit-Change-Number: 34719 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[L] Change in docker-playground[master]: Introduce ttcn3-hss-test-ogs
by pespin 15 Oct '23

15 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34715?usp=email ) Change subject: Introduce ttcn3-hss-test-ogs ...................................................................... Introduce ttcn3-hss-test-ogs Related: SYS#6588 Depends: osmo-ttcn3-hacks.git Ic2fccd9c54aea04f1a31649a0af47c974939fb2f Change-Id: Iebeefd9689ae2efa54678b99ff929ca255ec64d1 --- A ttcn3-hss-test-ogs/Dockerfile A ttcn3-hss-test-ogs/Makefile A ttcn3-hss-test-ogs/jenkins.sh A ttcn3-hss-test-ogs/ogs/HSS_Tests.cfg A ttcn3-hss-test-ogs/ogs/freediameter.conf A ttcn3-hss-test-ogs/ogs/mongod.conf A ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml 7 files changed, 503 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/ttcn3-hss-test-ogs/Dockerfile b/ttcn3-hss-test-ogs/Dockerfile new file mode 100644 index 0000000..f8ae830 --- /dev/null +++ b/ttcn3-hss-test-ogs/Dockerfile @@ -0,0 +1,21 @@ +ARG REGISTRY +ARG USER +FROM $REGISTRY/$USER/debian-bookworm-titan + +RUN apt-get update && \ + apt-get upgrade -y && \ + DEBIAN_FRONTEND='noninteractive' apt-get install -y --no-install-recommends --no-install-suggests \ + libgnutls28-dev \ + && \ + apt-get clean + +ARG OSMO_TTCN3_BRANCH="master" + +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" hss + +VOLUME /data + +COPY ogs/HSS_Tests.cfg /data/HSS_Tests.cfg + +CMD ttcn3-docker-run hss HSS_Tests diff --git a/ttcn3-hss-test-ogs/Makefile b/ttcn3-hss-test-ogs/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/ttcn3-hss-test-ogs/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/ttcn3-hss-test-ogs/jenkins.sh b/ttcn3-hss-test-ogs/jenkins.sh new file mode 100755 index 0000000..5ca59a9 --- /dev/null +++ b/ttcn3-hss-test-ogs/jenkins.sh @@ -0,0 +1,72 @@ +#!/bin/sh + +. ../jenkins-common.sh + +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "open5gs-$IMAGE_SUFFIX" \ + "ttcn3-hss-test-ogs" + +set_clean_up_trap +set -e + +mkdir -p $VOL_BASE_DIR/mongo/db +cp ogs/mongod.conf $VOL_BASE_DIR/mongo/ + +mkdir $VOL_BASE_DIR/hss-tester +cp ogs/HSS_Tests.cfg $VOL_BASE_DIR/hss-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/hss-tester/HSS_Tests.cfg" + +mkdir $VOL_BASE_DIR/hss +cp ogs/open5gs-*.yaml $VOL_BASE_DIR/hss/ +cp ogs/freediameter.conf $VOL_BASE_DIR/hss/ + +network_create +network_replace_subnet_in_configs + +# start container with mongod in background +docker run --rm --user $(id -u) \ + $(docker_network_params $SUBNET 103) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/mongo:/data \ + --name ${BUILD_TAG}-mongo -d \ + $DOCKER_ARGS \ + $REPO_USER/open5gs-$IMAGE_SUFFIX \ + /bin/sh -c "mongod -f /data/mongod.conf >/data/mongod.out 2>&1" + +# mongod needs some time to bootstrap... +while ! nc -z 172.18.$SUBNET.103 27017; do sleep 1; done + +# create a test subscriber with IMSI=001010000000000 +docker run --rm \ + $(docker_network_params $SUBNET 8) \ + $REPO_USER/open5gs-$IMAGE_SUFFIX \ + open5gs-dbctl --db_uri=mongodb://172.18.$SUBNET.103/open5gs \ + add 001010000000000 \ + 3c6e0b8a9c15224a8228b9a98ca1531d \ + 762a2206fe0b4151ace403c86a11e479 + +# start container with hss in background +docker run --sysctl net.ipv6.conf.all.disable_ipv6=0 \ + --rm \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/hss:/data \ + --name ${BUILD_TAG}-ogs-hss -d \ + $DOCKER_ARGS \ + $(docker_network_params $SUBNET 201) \ + $REPO_USER/open5gs-$IMAGE_SUFFIX \ + /bin/sh -c "open5gs-hssd -c /data/open5gs-hss.yaml >/data/open5gs-hssd.out 2>&1" + +# start docker container with testsuite in foreground +docker run --rm \ + --sysctl net.ipv6.conf.all.disable_ipv6=0 \ + $(docker_network_params $SUBNET 202) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/hss-tester:/data \ + -e "TTCN3_PCAP_PATH=/data" \ + --name ${BUILD_TAG}-hss-test \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-hss-test-ogs + +# remove mongodb's database +rm -rf $VOL_BASE_DIR/mongo/db/ diff --git a/ttcn3-hss-test-ogs/ogs/HSS_Tests.cfg b/ttcn3-hss-test-ogs/ogs/HSS_Tests.cfg new file mode 100644 index 0000000..17fa1a5 --- /dev/null +++ b/ttcn3-hss-test-ogs/ogs/HSS_Tests.cfg @@ -0,0 +1,26 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"/osmo-ttcn3-hacks/Common.cfg" +# testsuite specific configuration, not expected to change +"/osmo-ttcn3-hacks/hss/HSS_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] +mp_hss_hostname := "172.18.3.201"; +mp_hss_port := 3868; +mp_diam_local_hostname := "172.18.3.202"; +mp_diam_local_port := 3868; +mp_diam_orig_realm := "localdomain"; +mp_diam_orig_host := "mme.localdomain"; +mp_diam_dest_realm := "localdomain"; +mp_diam_dest_host := "hss.localdomain"; + +[MAIN_CONTROLLER] + +[EXECUTE] +HSS_Tests.control diff --git a/ttcn3-hss-test-ogs/ogs/freediameter.conf b/ttcn3-hss-test-ogs/ogs/freediameter.conf new file mode 100644 index 0000000..2678592 --- /dev/null +++ b/ttcn3-hss-test-ogs/ogs/freediameter.conf @@ -0,0 +1,265 @@ +# This is a sample configuration file for freeDiameter daemon. + +# Most of the options can be omitted, as they default to reasonable values. +# Only TLS-related options must be configured properly in usual setups. + +# It is possible to use "include" keyword to import additional files +# e.g.: include "/etc/freeDiameter.d/*.conf" +# This is exactly equivalent as copy & paste the content of the included file(s) +# where the "include" keyword is found. + + +############################################################## +## Peer identity and realm + +# The Diameter Identity of this daemon. +# This must be a valid FQDN that resolves to the local host. +# Default: hostname's FQDN +#Identity = "aaa.koganei.freediameter.net"; +Identity = "hss.localdomain"; + +# The Diameter Realm of this daemon. +# Default: the domain part of Identity (after the first dot). +#Realm = "koganei.freediameter.net"; +Realm = "localdomain"; + +############################################################## +## Transport protocol configuration + +# The port this peer is listening on for incoming connections (TCP and SCTP). +# Default: 3868. Use 0 to disable. +Port = 3868; + +# The port this peer is listening on for incoming TLS-protected connections (TCP and SCTP). +# See TLS_old_method for more information about TLS flavours. +# Note: we use TLS/SCTP instead of DTLS/SCTP at the moment. This will change in future version of freeDiameter. +# Default: 5868. Use 0 to disable. +SecPort = 0; + +# Use RFC3588 method for TLS protection, where TLS is negociated after CER/CEA exchange is completed +# on the unsecure connection. The alternative is RFC6733 mechanism, where TLS protects also the +# CER/CEA exchange on a dedicated secure port. +# This parameter only affects outgoing connections. +# The setting can be also defined per-peer (see Peers configuration section). +# Default: use RFC6733 method with separate port for TLS. +#TLS_old_method; + +# Disable use of TCP protocol (only listen and connect over SCTP) +# Default : TCP enabled +#No_TCP; + +# Disable use of SCTP protocol (only listen and connect over TCP) +# Default : SCTP enabled +#No_SCTP; +# This option is ignored if freeDiameter is compiled with DISABLE_SCTP option. + +# Prefer TCP instead of SCTP for establishing new connections. +# This setting may be overwritten per peer in peer configuration blocs. +# Default : SCTP is attempted first. +#Prefer_TCP; + +# Default number of streams per SCTP associations. +# This setting may be overwritten per peer basis. +# Default : 30 streams +#SCTP_streams = 30; + +############################################################## +## Endpoint configuration + +# Disable use of IP addresses (only IPv6) +# Default : IP enabled +#No_IP; + +# Disable use of IPv6 addresses (only IP) +# Default : IPv6 enabled +#No_IPv6; + +# Specify local addresses the server must bind to +# Default : listen on all addresses available. +#ListenOn = "202.249.37.5"; +#ListenOn = "2001:200:903:2::202:1"; +#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0"; +ListenOn = "172.18.3.201"; + + +############################################################## +## Server configuration + +# How many Diameter peers are allowed to be connecting at the same time ? +# This parameter limits the number of incoming connections from the time +# the connection is accepted until the first CER is received. +# Default: 5 unidentified clients in paralel. +#ThreadsPerServer = 5; + +############################################################## +## TLS Configuration + +# TLS is managed by the GNUTLS library in the freeDiameter daemon. +# You may find more information about parameters and special behaviors +# in the relevant documentation. +# http://www.gnu.org/software/gnutls/manual/ + +# Credentials of the local peer +# The X509 certificate and private key file to use for the local peer. +# The files must contain PKCS-1 encoded RSA key, in PEM format. +# (These parameters are passed to gnutls_certificate_set_x509_key_file function) +# Default : NO DEFAULT +#TLS_Cred = "<x509 certif file.PEM>" , "<x509 private key file.PEM>"; +#TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key"; + +# Certificate authority / trust anchors +# The file containing the list of trusted Certificate Authorities (PEM list) +# (This parameter is passed to gnutls_certificate_set_x509_trust_file function) +# The directive can appear several times to specify several files. +# Default : GNUTLS default behavior +#TLS_CA = "<file.PEM>"; + +# Certificate Revocation List file +# The information about revoked certificates. +# The file contains a list of trusted CRLs in PEM format. They should have been verified before. +# (This parameter is passed to gnutls_certificate_set_x509_crl_file function) +# Note: openssl CRL format might have interoperability issue with GNUTLS format. +# Default : GNUTLS default behavior +#TLS_CRL = "<file.PEM>"; + +# GNU TLS Priority string +# This string allows to configure the behavior of GNUTLS key exchanges +# algorithms. See gnutls_priority_init function documentation for information. +# You should also refer to the Diameter required TLS support here: +# http://tools.ietf.org/html/rfc6733#section-13.1 +# Default : "NORMAL" +# Example: TLS_Prio = "NONE:+VERS-TLS1.1:+AES-128-CBC:+RSA:+SHA1:+COMP-NULL"; +#TLS_Prio = "NORMAL"; + +# Diffie-Hellman parameters size +# Set the number of bits for generated DH parameters +# Valid value should be 768, 1024, 2048, 3072 or 4096. +# (This parameter is passed to gnutls_dh_params_generate2 function, +# it usually should match RSA key size) +# Default : 1024 +#TLS_DH_Bits = 1024; + +# Alternatively, you can specify a file to load the PKCS#3 encoded +# DH parameters directly from. This accelerates the daemon start +# but is slightly less secure. If this file is provided, the +# TLS_DH_Bits parameters has no effect. +# Default : no default. +#TLS_DH_File = "<file.PEM>"; + + +############################################################## +## Timers configuration + +# The Tc timer of this peer. +# It is the delay before a new attempt is made to reconnect a disconnected peer. +# The value is expressed in seconds. The recommended value is 30 seconds. +# Default: 30 +#TcTimer = 30; + +# The Tw timer of this peer. +# It is the delay before a watchdog message is sent, as described in RFC 3539. +# The value is expressed in seconds. The default value is 30 seconds. Value must +# be greater or equal to 6 seconds. See details in the RFC. +# Default: 30 +#TwTimer = 30; + +############################################################## +## Applications configuration + +# Disable the relaying of Diameter messages? +# For messages not handled locally, the default behavior is to forward the +# message to another peer if any is available, according to the routing +# algorithms. In addition the "0xffffff" application is advertised in CER/CEA +# exchanges. +# Default: Relaying is enabled. +#NoRelay; +NoRelay; + +# Number of server threads that can handle incoming messages at the same time. +# Default: 4 +#AppServThreads = 4; + +# Other applications are configured by loaded extensions. + +############################################################## +## Extensions configuration + +# The freeDiameter framework merely provides support for +# Diameter Base Protocol. The specific application behaviors, +# as well as advanced functions, are provided +# by loadable extensions (plug-ins). +# These extensions may in addition receive the name of a +# configuration file, the format of which is extension-specific. +# +# Format: +#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ; +# +# Examples: +#LoadExtension = "extensions/sample.fdx"; +#LoadExtension = "extensions/sample.fdx":"conf/sample.conf"; + +# Extensions are named as follow: +# dict_* for extensions that add content to the dictionary definitions. +# dbg_* for extensions useful only to retrieve more information on the framework execution. +# acl_* : Access control list, to control which peers are allowed to connect. +# rt_* : routing extensions that impact how messages are forwarded to other peers. +# app_* : applications, these extensions usually register callbacks to handle specific messages. +# test_* : dummy extensions that are useful only in testing environments. + + +# The dbg_msg_dump.fdx extension allows you to tweak the way freeDiameter displays some +# information about some events. This extension does not actually use a configuration file +# but receives directly a parameter in the string passed to the extension. Here are some examples: +## LoadExtension = "dbg_msg_dumps.fdx" : "0x1111"; # Removes all default hooks, very quiet even in case of errors. +## LoadExtension = "dbg_msg_dumps.fdx" : "0x2222"; # Display all events with few details. +## LoadExtension = "dbg_msg_dumps.fdx" : "0x0080"; # Dump complete information about sent and received messages. +# The four digits respectively control: connections, routing decisions, sent/received messages, errors. +# The values for each digit are: +# 0 - default - keep the default behavior +# 1 - quiet - remove any specific log +# 2 - compact - display only a summary of the information +# 4 - full - display the complete information on a single long line +# 8 - tree - display the complete information in an easier to read format spanning several lines. + +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dbg_msg_dumps.fdx" : "0x8888"; +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dict_rfc5777.fdx"; +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dict_mip6i.fdx"; +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dict_nasreq.fdx"; +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dict_nas_mipv6.fdx"; +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dict_dcca.fdx"; +LoadExtension = "/usr/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx"; + + +############################################################## +## Peers configuration + +# The local server listens for incoming connections. By default, +# all unknown connecting peers are rejected. Extensions can override this behavior (e.g., acl_wl). +# +# In addition to incoming connections, the local peer can +# be configured to establish and maintain connections to some +# Diameter nodes and allow connections from these nodes. +# This is achieved with the ConnectPeer directive described below. +# +# Note that the configured Diameter Identity MUST match +# the information received inside CEA, or the connection will be aborted. +# +# Format: +#ConnectPeer = "diameterid" [ { parameter1; parameter2; ...} ] ; +# Parameters that can be specified in the peer's parameter list: +# No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method; +# No_TLS; # assume transparent security instead of TLS. DTLS is not supported yet (will change in future versions). +# Port = 5868; # The port to connect to +# TcTimer = 30; +# TwTimer = 30; +# ConnectTo = "202.249.37.5"; +# ConnectTo = "2001:200:903:2::202:1"; +# TLS_Prio = "NORMAL"; +# Realm = "realm.net"; # Reject the peer if it does not advertise this realm. +# Examples: +#ConnectPeer = "aaa.wide.ad.jp"; +#ConnectPeer = "old.diameter.serv" { TcTimer = 60; TLS_old_method; No_SCTP; Port=3868; } ; +ConnectPeer = "mme.localdomain" { ConnectTo = "172.18.3.202"; Port = 3868; No_TLS; TcTimer = 2; }; + + +############################################################## diff --git a/ttcn3-hss-test-ogs/ogs/mongod.conf b/ttcn3-hss-test-ogs/ogs/mongod.conf new file mode 100644 index 0000000..65beb4e --- /dev/null +++ b/ttcn3-hss-test-ogs/ogs/mongod.conf @@ -0,0 +1,44 @@ +# mongod.conf + +# for documentation of all options, see: +# http://docs.mongodb.org/manual/reference/configuration-options/ + +# Where and how to store data. +storage: + dbPath: /data/db + journal: + enabled: true +# engine: +# mmapv1: +# wiredTiger: + +# where to write logging data. +systemLog: + destination: file + logAppend: true + path: /data/mongod.log + +# network interfaces +net: + port: 27017 + bindIp: 172.18.16.103 + + +# how the process runs +processManagement: + timeZoneInfo: /usr/share/zoneinfo + +#security: + +#operationProfiling: + +#replication: + +#sharding: + +## Enterprise-Only Options: + +#auditLog: + +#snmp: + diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml b/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml new file mode 100644 index 0000000..5f38e58 --- /dev/null +++ b/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml @@ -0,0 +1,63 @@ +db_uri: mongodb://172.18.3.103/open5gs + +# +# o Set OGS_LOG_INFO to all domain level +# - If `level` is omitted, the default level is OGS_LOG_INFO) +# - If `domain` is omitted, the all domain level is set from 'level' +# (Default values are used, so no configuration is required) +# +# o Set OGS_LOG_ERROR to all domain level +# - `level` can be set with none, fatal, error, warn, info, debug, trace +# logger: +# level: error +# +# o Set OGS_LOG_DEBUG to mme/emm domain level +# logger: +# level: debug +# domain: mme,emm +# +# o Set OGS_LOG_TRACE to all domain level +# logger: +# level: trace +# domain: core,sbi,ausf,event,tlv,mem,sock +# +logger: + level: trace + +hss: + freeDiameter: /data/freediameter.conf + +# +# hss: +# sms_over_ims: "sip:smsc.mnc001.mcc001.3gppnetwork.org:7060;transport=tcp" +# + +# +# o Disable use of IPv4 addresses (only IPv6) +# parameter: +# no_ipv4: true +# +# o Disable use of IPv6 addresses (only IPv4) +# parameter: +# no_ipv6: true +# +# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections. +# parameter: +# prefer_ipv4: true +# +# o Use MongoDB Change Stream +# parameter: +# use_mongodb_change_stream: true +# +parameter: + +# +# o Maximum Number of UE +# max: +# ue: 1024 +# +# o Maximum Number of Peer(S1AP/NGAP, DIAMETER, GTP, PFCP or SBI) +# max: +# peer: 64 +# +max: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34715?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iebeefd9689ae2efa54678b99ff929ca255ec64d1 Gerrit-Change-Number: 34715 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <daniel(a)totalueberwachung.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: open5gs-latest: Support debian bookworm
by pespin 15 Oct '23

15 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34712?usp=email ) Change subject: open5gs-latest: Support debian bookworm ...................................................................... open5gs-latest: Support debian bookworm The open5gs Debian_12 is available since today [1]; hence starting using debian 12 now. [1] https://github.com/open5gs/open5gs/issues/2669 Related: SYS#6588 Change-Id: Ib11a55294b525e3c3806246b133f8e479554a068 --- M open5gs-latest/Dockerfile 1 file changed, 41 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/open5gs-latest/Dockerfile b/open5gs-latest/Dockerfile index 7c385e2..c395d9c 100644 --- a/open5gs-latest/Dockerfile +++ b/open5gs-latest/Dockerfile @@ -1,8 +1,12 @@ ARG REGISTRY=docker.io -FROM ${REGISTRY}/debian:bullseye +ARG UPSTREAM_DISTRO=debian:bookworm +FROM ${REGISTRY}/${UPSTREAM_DISTRO} +# Arguments used after FROM must be specified again +ARG DISTRO + ARG OPEN5GS_REPO_HOST="https://download.opensuse.org" ARG OPEN5GS_REPO_PATH="repositories/home:/acetcom:/open5gs:" -ARG OPEN5GS_REPO="${OPEN5GS_REPO_HOST}/${OPEN5GS_REPO_PATH}/latest/Debian_11" +ARG OPEN5GS_REPO="${OPEN5GS_REPO_HOST}/${OPEN5GS_REPO_PATH}/latest/Debian_12" ARG OPEN5GS_KEY=/usr/share/keyrings/open5gs-latest.asc ARG MONGODB_KEY=/usr/share/keyrings/mongodb-org.asc @@ -18,13 +22,29 @@ sudo \ wget +RUN wget "https://pgp.mongodb.com/server-5.0.asc" -O "$MONGODB_KEY" +RUN case "$DISTRO" in \ + debian-*) \ + DEBIAN_VERSION=$(echo "$DISTRO" | cut -d "-" -f2); \ + if [ "x${DEBIAN_VERSION}" = "xbookworm" ]; then \ + echo "Using bullseye since bookworm mongodb-org package is not available. Furthermore, manually install required libssl1.1." && \ + DEBIAN_VERSION="bullseye" && \ + wget "http://security.debian.org/debian-security/pool/updates/main/o/openssl/libs…" && \ + dpkg -i "libssl1.1_1.1.1n-0+deb10u6_amd64.deb" && \ + rm "libssl1.1_1.1.1n-0+deb10u6_amd64.deb"; \ + fi; \ + echo "deb [signed-by=$MONGODB_KEY] http://repo.mongodb.org/apt/debian ${DEBIAN_VERSION}/mongodb-org/5.0 main" \ + > /etc/apt/sources.list.d/mongodb-org.list \ + ;; \ + centos*) \ + echo "TODO: centos" && \ + exit 1 \ + ;; \ + esac + RUN echo "deb [signed-by=$OPEN5GS_KEY] $OPEN5GS_REPO/ ./" \ > /etc/apt/sources.list.d/open5gs.list -RUN echo "deb [signed-by=$MONGODB_KEY] http://repo.mongodb.org/apt/debian bullseye/mongodb-org/5.0 main" \ - > /etc/apt/sources.list.d/mongodb-org.list - -RUN wget "$OPEN5GS_REPO/Release.key" -O "$OPEN5GS_KEY" && \ - wget "https://pgp.mongodb.com/server-5.0.asc" -O "$MONGODB_KEY" +RUN wget "$OPEN5GS_REPO/Release.key" -O "$OPEN5GS_KEY" RUN apt-get update && \ apt-get install -y \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34712?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib11a55294b525e3c3806246b133f8e479554a068 Gerrit-Change-Number: 34712 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: open5gs-latest: Support debian bookworm
by pespin 15 Oct '23

15 Oct '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34712?usp=email ) Change subject: open5gs-latest: Support debian bookworm ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34712?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib11a55294b525e3c3806246b133f8e479554a068 Gerrit-Change-Number: 34712 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 15 Oct 2023 21:47:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0