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

Change in libosmocore[master]: i460_mux: make osmo_i460_subchan_count public

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31324 ) Change subject: i460_mux: make osmo_i460_subchan_count public ...................................................................... i460_mux: make osmo_i460_subchan_count public There may be situations where we must check if there are still I.460 subchannels active, so lets make the function osmo_i460_subchan_count public Change-Id: I0454ffe5809f21504c1e263a781c06596d452d4b Related: OS#5198 --- M include/osmocom/isdn/i460_mux.h M src/isdn/i460_mux.c M src/isdn/libosmoisdn.map 3 files changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/31324/1 diff --git a/include/osmocom/isdn/i460_mux.h b/include/osmocom/isdn/i460_mux.h index 770b1e1..ad9cb24 100644 --- a/include/osmocom/isdn/i460_mux.h +++ b/include/osmocom/isdn/i460_mux.h @@ -113,4 +113,6 @@ void osmo_i460_subchan_del(struct osmo_i460_subchan *schan); +int osmo_i460_subchan_count(struct osmo_i460_timeslot *ts); + /*! @} */ diff --git a/src/isdn/i460_mux.c b/src/isdn/i460_mux.c index 18a807d..9e9489a 100644 --- a/src/isdn/i460_mux.c +++ b/src/isdn/i460_mux.c @@ -23,8 +23,10 @@ #include <osmocom/core/msgb.h> #include <osmocom/isdn/i460_mux.h> -/* count the number of sub-channels in this I460 slot */ -static int osmo_i460_subchan_count(struct osmo_i460_timeslot *ts) +/*! count the number of sub-channels in this I.460 slot. + * \param[in] ts timeslot that holds the I.460 subchannels. + * \return number of subchannels. */ +int osmo_i460_subchan_count(struct osmo_i460_timeslot *ts) { int i, num_used = 0; diff --git a/src/isdn/libosmoisdn.map b/src/isdn/libosmoisdn.map index 76e8c81..5ac65c9 100644 --- a/src/isdn/libosmoisdn.map +++ b/src/isdn/libosmoisdn.map @@ -18,6 +18,7 @@ osmo_i460_mux_out; osmo_i460_subchan_add; osmo_i460_subchan_del; +osmo_i460_subchan_count; osmo_i460_ts_init; local: *; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31324 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0454ffe5809f21504c1e263a781c06596d452d4b Gerrit-Change-Number: 31324 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in libosmo-abis[master]: e1_input: cleanup TS resources when timeslot type is changed

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31323 ) Change subject: e1_input: cleanup TS resources when timeslot type is changed ...................................................................... e1_input: cleanup TS resources when timeslot type is changed There may be situations where we want to change the timeslot type by calling a different e1inp_ts_config_xyz function at some later point. In those cases we must ensure that no dynamically allocated resources remain in the type dependend union of struct e1inp_ts. Depends: libosmocore.git I0454ffe5809f21504c1e263a781c06596d452d4b Related: OS#5198 Change-Id: Icf84816460b8ceba43601594bcf504306606f4ed --- M src/e1_input.c 1 file changed, 62 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/23/31323/1 diff --git a/src/e1_input.c b/src/e1_input.c index a7313dd..5dd415b 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -361,6 +361,56 @@ return 0; } +/* Depending on its typ a timeslot may hold resources which must be cleaned up + * or reset before the type of the timeslot type may be changed. */ +static int cleanup_e1inp_ts(struct e1inp_ts *e1i_ts) +{ + int rc; + + switch (e1i_ts->type) { + case E1INP_TS_TYPE_SIGN: + /* The caller is responsible for removing all signalling links + * first. */ + if (!llist_empty(&e1i_ts->sign.sign_links)) { + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, + "timeslot still holds active signalling links -- cannot modify timeslot!\n"); + return -EINVAL; + } + return 0; + case E1INP_TS_TYPE_TRAU: + /* Call the initialization functions once more. This will + * deactivate all subchannels so that the related callbacks + * are no longer called */ + subchan_mux_init(&e1i_ts->trau.mux); + subch_demux_init(&e1i_ts->trau.demux); + return 0; + case E1INP_TS_TYPE_RAW: + msgb_queue_free(&e1i_ts->raw.tx_queue); + return 0; + case E1INP_TS_TYPE_HDLC: + msgb_queue_free(&e1i_ts->hdlc.tx_queue); + return 0; + case E1INP_TS_TYPE_I460: + /* The caller is responsible for removing all I.460 subchannels + * first. */ + rc = osmo_i460_subchan_count(&e1i_ts->i460.i460_ts); + if (rc != 0) { + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, + "timeslot still holds active I.460 subchannels -- cannot modify timeslot!\n"); + return -EINVAL; + } + return 0; + case E1INP_TS_TYPE_NONE: + return 0; + default: + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "unsupported E1 TS type %u\n", + e1i_ts->type); + return -EINVAL; + } + + return 0; +} + /* Timeslot */ int e1inp_ts_config_trau(struct e1inp_ts *ts, struct e1inp_line *line, int (*trau_rcv_cb)(struct subch_demux *dmx, int ch, @@ -369,6 +419,8 @@ if (ts->type == E1INP_TS_TYPE_TRAU && ts->line && line) return 0; + cleanup_e1inp_ts(ts); + ts->type = E1INP_TS_TYPE_TRAU; ts->line = line; @@ -384,6 +436,8 @@ if (ts->type == E1INP_TS_TYPE_I460 && ts->line && line) return 0; + cleanup_e1inp_ts(ts); + ts->type = E1INP_TS_TYPE_I460; ts->line = line; osmo_i460_ts_init(&ts->i460.i460_ts); @@ -403,6 +457,8 @@ if (ts->type == E1INP_TS_TYPE_SIGN && ts->line && line) return 0; + cleanup_e1inp_ts(ts); + ts->type = E1INP_TS_TYPE_SIGN; ts->line = line; @@ -421,6 +477,8 @@ if (ts->type == E1INP_TS_TYPE_RAW && ts->line && line) return 0; + cleanup_e1inp_ts(ts); + ts->type = E1INP_TS_TYPE_RAW; ts->line = line; ts->raw.recv_cb = raw_recv_cb; @@ -436,6 +494,8 @@ if (ts->type == E1INP_TS_TYPE_HDLC && ts->line && line) return 0; + cleanup_e1inp_ts(ts); + ts->type = E1INP_TS_TYPE_HDLC; ts->line = line; ts->hdlc.recv_cb = hdlc_recv_cb; @@ -449,6 +509,8 @@ if (ts->type == E1INP_TS_TYPE_NONE && ts->line && line) return 0; + cleanup_e1inp_ts(ts); + ts->type = E1INP_TS_TYPE_NONE; ts->line = line; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31323 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Icf84816460b8ceba43601594bcf504306606f4ed Gerrit-Change-Number: 31323 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in libosmocore[master]: i460_mux.c fix apidoc

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31322 ) Change subject: i460_mux.c fix apidoc ...................................................................... i460_mux.c fix apidoc Change-Id: Ib701e3f8f4261087c2fd2719a52e4d785db11ddc --- M src/isdn/i460_mux.c 1 file changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/22/31322/1 diff --git a/src/isdn/i460_mux.c b/src/isdn/i460_mux.c index eeaed3c..18a807d 100644 --- a/src/isdn/i460_mux.c +++ b/src/isdn/i460_mux.c @@ -119,10 +119,10 @@ } } -/*! Data from E1 timeslot into de-multiplexer - * \param[in] ts timeslot state - * \param[in] data input data bytes as received from E1/T1 - * \param[in] data_len length of data in bytes */ +/*! Feed multiplexed data (from an E1 timeslot) into de-multiplexer. + * \param[in] ts timeslot state. + * \param[in] data input data bytes as received from E1/T1. + * \param[in] data_len length of data in bytes. */ void osmo_i460_demux_in(struct osmo_i460_timeslot *ts, const uint8_t *data, size_t data_len) { struct osmo_i460_subchan *schan; @@ -262,11 +262,10 @@ } -/*! Data from E1 timeslot into de-multiplexer - * \param[in] ts timeslot state - * \param[out] out caller-provided buffer where to store generated output bytes - * \param[in] out_len number of bytes to be stored at out - */ +/*! Get multiplexed data from de-multiplexer (for feeding it into an E1 timeslot). + * \param[in] ts timeslot state. + * \param[out] out caller-provided buffer where to store generated output bytes. + * \param[in] out_len number of bytes to be stored at out. */ int osmo_i460_mux_out(struct osmo_i460_timeslot *ts, uint8_t *out, size_t out_len) { int i; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib701e3f8f4261087c2fd2719a52e4d785db11ddc Gerrit-Change-Number: 31322 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: check if LIBTRXCON_DIR (submodule) exists

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30795 ) Change subject: configure.ac: check if LIBTRXCON_DIR (submodule) exists ...................................................................... Patch Set 3: (1 comment) File configure.ac: https://gerrit.osmocom.org/c/osmo-trx/+/30795/comment/98d14a78_442f6168 PS3, Line 218: AC_MSG_ERROR([$LIBTRXCON_DIR does not exist]) > give a hint here, what git command the user should run to fetch the submodule? Good point. Will do in a separate patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I06456c2087e160032f5bf8b36304477390f117d0 Gerrit-Change-Number: 30795 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(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-Comment-Date: Tue, 14 Feb 2023 10:15:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-trx[master]: configure.ac: check if LIBTRXCON_DIR (submodule) exists

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30795 ) Change subject: configure.ac: check if LIBTRXCON_DIR (submodule) exists ...................................................................... configure.ac: check if LIBTRXCON_DIR (submodule) exists Fail during the configure stage if the submodule is not fetched. Change-Id: I06456c2087e160032f5bf8b36304477390f117d0 Related: OS#5599 --- M configure.ac 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 7451b50..abdcc2f 100644 --- a/configure.ac +++ b/configure.ac @@ -212,7 +212,12 @@ AC_MSG_CHECKING([whether to enable building MS TRX]) AS_IF([test "x$with_mstrx" = "xyes"], [ AC_CONFIG_SUBDIRS([osmocom-bb/src/host/trxcon]) - AC_SUBST(LIBTRXCON_DIR, "osmocom-bb/src/host/trxcon") + LIBTRXCON_DIR="osmocom-bb/src/host/trxcon" + if ! test -d "$srcdir/$LIBTRXCON_DIR"; then + AC_MSG_RESULT([no]) + AC_MSG_ERROR([$LIBTRXCON_DIR does not exist]) + fi + AC_SUBST(LIBTRXCON_DIR) AC_MSG_RESULT([yes]) ], [ # Despite LIBTRXCON_DIR is added to SUBDIRS conditionally, -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I06456c2087e160032f5bf8b36304477390f117d0 Gerrit-Change-Number: 30795 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(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

2 years, 4 months

1
0
0 0

Change in libosmo-sccp[master]: SS7: do not attempt transfer if AS is down

by laforge

Attention is currently required from: neels, pespin, msuraev. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 ) Change subject: SS7: do not attempt transfer if AS is down ...................................................................... Patch Set 2: Code-Review-1 (1 comment) File src/osmo_ss7.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/31295/comment/02324f62_e6f95571 PS2, Line 1151: if (!as->fi) > Ack indeed, we should change this into OSMO_ASSERT before merge. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0d5f3b6265e7fdaa79e32fbc30f829ef79e7dad1 Gerrit-Change-Number: 31295 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Feb 2023 10:14:52 +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

2 years, 4 months

1
0
0 0

Change in libosmo-sccp[master]: SS7: do not attempt transfer if AS is down

by laforge

Attention is currently required from: neels, pespin, msuraev. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 ) Change subject: SS7: do not attempt transfer if AS is down ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0d5f3b6265e7fdaa79e32fbc30f829ef79e7dad1 Gerrit-Change-Number: 31295 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Feb 2023 10:14:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in libosmo-sccp[master]: SS7: do not attempt transfer if AS is down

by laforge

Attention is currently required from: neels, pespin, msuraev. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 ) Change subject: SS7: do not attempt transfer if AS is down ...................................................................... Patch Set 2: Code-Review+2 (2 comments) File src/osmo_ss7.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/31295/comment/4b4ad1c2_72a8040e PS2, Line 1151: if (!as->fi) > So now we enter the debate whether an unexisting as is down or not. […] Ack File src/osmo_ss7_hmrt.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/31295/comment/5eaa6c76_5aa329c0 PS2, Line 234: return -ENETDOWN; > I'm fine with ENETDOWN, to me that's what's being cecked. neels point-of-view is from the IP/socket perspective, while pespin is looking at it from the SS7 perspective. I also think NETDOWN is fine. From the SS7 point of view, the SCTP assocation is the underlying physical medium. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/31295 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I0d5f3b6265e7fdaa79e32fbc30f829ef79e7dad1 Gerrit-Change-Number: 31295 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Feb 2023 10:14:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

Change in osmo-ci[master]: repo-install-test: run uname -a

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31313 ) Change subject: repo-install-test: run uname -a ...................................................................... repo-install-test: run uname -a Print the kernel version running inside the VM. Change-Id: Ic111ac8eda11c5609ec6ce7cf8a22584d32ed567 --- M scripts/repo-install-test/run-inside.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/scripts/repo-install-test/run-inside.sh b/scripts/repo-install-test/run-inside.sh index 6fcc391..319e822 100755 --- a/scripts/repo-install-test/run-inside.sh +++ b/scripts/repo-install-test/run-inside.sh @@ -477,6 +477,8 @@ check_env prepare_vm +uname -a + for test in $TESTS; do set +x echo -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31313 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic111ac8eda11c5609ec6ce7cf8a22584d32ed567 Gerrit-Change-Number: 31313 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

Change in osmo-ci[master]: repo-install-test: add DOMAIN variable

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31312 ) Change subject: repo-install-test: add DOMAIN variable ...................................................................... repo-install-test: add DOMAIN variable Allow overriding the downloads.osmocom.org domain of the url where packages are downloaded from, so we can download them from people.osmocom.org instead while developing / debugging, e.g.: https://people.osmocom.org/packages/home:/osmith:/nightly/ Change-Id: I36bc0eae9fdee75512c1dbdca84cd6224b8c192a --- M scripts/repo-install-test.sh M scripts/repo-install-test/run-inside.sh 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh index 38f1a6b..676354a 100755 --- a/scripts/repo-install-test.sh +++ b/scripts/repo-install-test.sh @@ -1,5 +1,6 @@ #!/bin/sh -ex # Environment variables: +# * DOMAIN: default is downloads.osmocom.org, set to people.osmocom.org for testing pkgs from home:… # * FEED: binary package feed (e.g. "latest", "nightly") # * INTERACTIVE: set to 1 to keep an interactive shell open after the script ran (for debugging) # * KEEP_VM: for development: don't kill/start VM if still running @@ -9,6 +10,7 @@ # * TESTS: which tests to run (all by default, see below for possible values) . "$(dirname "$0")/common.sh" +DOMAIN="${DOMAIN:-downloads.osmocom.org}" DISTRO="$1" DISTROS=" centos8 @@ -136,6 +138,7 @@ #!/bin/sh -ex export DISTRO="$DISTRO" + export DOMAIN="$DOMAIN" export FEED="$FEED" export PROJ="$PROJ" export PROJ_CONFLICT="$PROJ_CONFLICT" diff --git a/scripts/repo-install-test/run-inside.sh b/scripts/repo-install-test/run-inside.sh index d959cc0..6fcc391 100755 --- a/scripts/repo-install-test/run-inside.sh +++ b/scripts/repo-install-test/run-inside.sh @@ -108,7 +108,7 @@ # $1: OBS project (e.g. "osmocom:nightly") configure_osmocom_repo_debian() { local proj="$1" - local obs_repo="downloads.osmocom.org/packages/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR/" + local obs_repo="$DOMAIN/packages/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR/" echo "Configuring Osmocom repository" @@ -132,7 +132,7 @@ # $1: OBS project (e.g. "osmocom:nightly") configure_osmocom_repo_centos() { local proj="$1" - local baseurl="https://downloads.osmocom.org/packages/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR" + local baseurl="https://$DOMAIN/packages/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR" echo "Configuring Osmocom repository" # Generate this file, based on the feed: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31312 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I36bc0eae9fdee75512c1dbdca84cd6224b8c192a Gerrit-Change-Number: 31312 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023