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

Change in osmocom-bb[master]: layer23: Move '(no) shutdown' VTY code to common/vty.c

by pespin

Attention is currently required from: neels, msuraev. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/30972 to look at the new patch set (#4). Change subject: layer23: Move '(no) shutdown' VTY code to common/vty.c ...................................................................... layer23: Move '(no) shutdown' VTY code to common/vty.c Change-Id: Ib5c9b6f3efa255d67980945db9f98dd8a112af0e --- A doc/examples/modem/modem.cfg M src/host/layer23/include/osmocom/bb/common/osmocom_data.h M src/host/layer23/include/osmocom/bb/common/vty.h M src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/vty_interface.c M src/host/layer23/src/modem/vty.c 6 files changed, 149 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/72/30972/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib5c9b6f3efa255d67980945db9f98dd8a112af0e Gerrit-Change-Number: 30972 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Initial VTY framework to share VTY code between apps

by pespin

Attention is currently required from: neels, msuraev. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/30961 to look at the new patch set (#11). Change subject: layer23: Initial VTY framework to share VTY code between apps ...................................................................... layer23: Initial VTY framework to share VTY code between apps A small layer23 framework is added which allows apps to easily share/reuse VTY commands while giving some flexiblity to add new per-app specific configs/cmds, since not all commands may be relevant for all apps. Some of the mobile app code is moved to common, and sample infra is added to modem app. Future commits will most probably keep moving more stuff mobile->common and then reusing those in modem app, as found needed. Change-Id: Iabfb3129199488d790b89884bc1e424f2aca696f --- M src/host/layer23/include/osmocom/bb/common/Makefile.am A src/host/layer23/include/osmocom/bb/common/vty.h M src/host/layer23/include/osmocom/bb/mobile/vty.h M src/host/layer23/include/osmocom/bb/modem/Makefile.am A src/host/layer23/include/osmocom/bb/modem/vty.h M src/host/layer23/src/common/Makefile.am A src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/vty_interface.c M src/host/layer23/src/modem/Makefile.am M src/host/layer23/src/modem/app_modem.c A src/host/layer23/src/modem/vty.c 12 files changed, 311 insertions(+), 91 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/61/30961/11 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iabfb3129199488d790b89884bc1e424f2aca696f Gerrit-Change-Number: 30961 Gerrit-PatchSet: 11 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 5 months

1
0
0 0

Change in osmocom-bb[master]: layer23: Move layer2-socket VTY command to common/

by pespin

Attention is currently required from: neels, pespin, msuraev. Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/30978 to look at the new patch set (#3). Change subject: layer23: Move layer2-socket VTY command to common/ ...................................................................... layer23: Move layer2-socket VTY command to common/ This allows configuring layer2-socket for other apps than mobile, like the "modem" one. Change-Id: If7419f8fc54a54eed68a076968d93dba5ac977b7 --- M src/host/layer23/include/osmocom/bb/common/l1l2_interface.h M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/include/osmocom/bb/common/vty.h M src/host/layer23/src/common/main.c M src/host/layer23/src/common/ms.c M src/host/layer23/src/common/settings.c M src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/vty_interface.c 9 files changed, 51 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/78/30978/3 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If7419f8fc54a54eed68a076968d93dba5ac977b7 Gerrit-Change-Number: 30978 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(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-MessageType: newpatchset

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: gsm_utils: improve gsm_gsmtime2fn()

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30946 ) Change subject: gsm_utils: improve gsm_gsmtime2fn() ...................................................................... gsm_utils: improve gsm_gsmtime2fn() The function gsm_gsmtime2fn() uses a hack to account for the truncated modulo implementation of C/C++. libosmocore offers proven modulo functions, so lets use OSMO_MOD_FLR() instead. Also arrange the formula so that it looks more like the one in the spec. Also add better spec references and a final modulo GSM_MAX_FN to prevent frame number results that exceed the valid range. Change-Id: Ibf94bca8223f1f7858a6dd67bf27de0ab6feab20 --- M src/gsm/gsm_utils.c 1 file changed, 13 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/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index 3b0ec6a..bbc7dd6 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -887,8 +887,19 @@ * \returns GSM Frame Number */ uint32_t gsm_gsmtime2fn(struct gsm_time *time) { - /* TS 05.02 Chapter 4.3.3 TDMA frame number */ - return (51 * ((time->t3 - time->t2 + 26) % 26) + time->t3 + (26 * 51 * time->t1)); + uint32_t fn; + + /* See also: + * 3GPP TS 44.018, section 10.5.2.38, 3GPP TS 45.002 section 4.3.3, and + * 3GPP TS 48.058, section 9.3.8 */ + fn = 51 * OSMO_MOD_FLR((time->t3-time->t2), 26) + time->t3 + 51 * 26 * time->t1; + + /* Note: Corrupted input values may cause a resulting frame number + * larger then the maximum permitted value of GSM_MAX_FN. Even though + * the caller is expected to check the input values beforehand we must + * make sure that the result cannot exceed the value range of a valid + * GSM frame number. */ + return fn % GSM_MAX_FN; } char *osmo_dump_gsmtime_buf(char *buf, size_t buf_len, const struct gsm_time *tm) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibf94bca8223f1f7858a6dd67bf27de0ab6feab20 Gerrit-Change-Number: 30946 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(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

2 years, 5 months

1
0
0 0

Change in libosmocore[master]: gsm0408_test: add unittest for gsm_gsmtime2fn()

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30945 ) Change subject: gsm0408_test: add unittest for gsm_gsmtime2fn() ...................................................................... gsm0408_test: add unittest for gsm_gsmtime2fn() The function gsm_gsmtime2fn(), which is used to compute a frame number value from given starting time values T1, T2 and T3 has no unit test. Due to to the modulo that is used the computation can be a bit tricky. Lets add a unit-test to make sure the function works as expected. Change-Id: I8b9b71c8dcccf3b44326b5e61229f4637689d763 --- M tests/gsm0408/gsm0408_test.c 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index a226718..4436d51 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -1760,6 +1760,27 @@ } } +static void test_gsm_gsmtime2fn(void) +{ + struct gsm_time gsm_time; + uint32_t fn; + uint32_t fn_recovered; + + for (fn = 0; fn < 42432; fn++) { + gsm_time.t1 = (fn / 1326) % 32; + gsm_time.t2 = fn % 26; + gsm_time.t3 = fn % 51; + + fn_recovered = gsm_gsmtime2fn(&gsm_time); + + if (fn_recovered != fn) { + printf(" Wrong frame number computed! t1=%d, t2=%d, t3=%d ==> fn=%d, expected fn=%d\n", + gsm_time.t1, gsm_time.t2, gsm_time.t3, fn_recovered, fn); + OSMO_ASSERT(false); + } + } +} + int main(int argc, char **argv) { test_bearer_cap(); @@ -1779,6 +1800,7 @@ test_range_encoding(); test_power_ctrl(); test_rach_tx_integer_raw2val(); + test_gsm_gsmtime2fn(); return EXIT_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8b9b71c8dcccf3b44326b5e61229f4637689d763 Gerrit-Change-Number: 30945 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(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

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-verifications: osmo-trx: fix matrix

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30985 ) Change subject: jobs/gerrit-verifications: osmo-trx: fix matrix ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I51e58765dd33b15df2e9f2eb09c1260724e4ec9c Gerrit-Change-Number: 30985 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: Mon, 16 Jan 2023 12:22:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-verifications: osmo-trx: fix matrix

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30985 ) Change subject: jobs/gerrit-verifications: osmo-trx: fix matrix ...................................................................... jobs/gerrit-verifications: osmo-trx: fix matrix Add the missing comma between "--without-sse, --without-neon", so the matrix works as expected. Without this patch, the two builds with these flags didn't run. Change-Id: I51e58765dd33b15df2e9f2eb09c1260724e4ec9c --- M jobs/gerrit-verifications.yml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/85/30985/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 10cc91b..0f35fcd 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -281,7 +281,7 @@ - osmo-trx: slave_axis: !!python/tuple [osmocom-gerrit,rpi4-raspbian11] a1_name: INSTR - a1: !!python/tuple [--with-sse, --without-sse --with-neon, --with-neon-vfpv4] + a1: !!python/tuple [--with-sse, --without-sse, --with-neon, --with-neon-vfpv4] a2_name: WITH_MANUALS a2: !!python/tuple ["1", "0"] combination_filter: > -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I51e58765dd33b15df2e9f2eb09c1260724e4ec9c Gerrit-Change-Number: 30985 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-trx[master]: Do not merge: test commit for gerrit verfications

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30984 ) Change subject: Do not merge: test commit for gerrit verfications ...................................................................... Patch Set 1: Code-Review-2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iddc68cc70b89ac35aa15d37085cf0abc1bfc3492 Gerrit-Change-Number: 30984 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Jan 2023 11:59:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-trx[master]: Do not merge: test commit for gerrit verfications

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/30984 ) Change subject: Do not merge: test commit for gerrit verfications ...................................................................... Do not merge: test commit for gerrit verfications Change-Id: Iddc68cc70b89ac35aa15d37085cf0abc1bfc3492 --- A test 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/84/30984/1 diff --git a/test b/test new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iddc68cc70b89ac35aa15d37085cf0abc1bfc3492 Gerrit-Change-Number: 30984 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in docker-playground[master]: ttcn3-*/jenkins*.sh: use $SUBNET everywhere

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30769 ) Change subject: ttcn3-*/jenkins*.sh: use $SUBNET everywhere ...................................................................... ttcn3-*/jenkins*.sh: use $SUBNET everywhere Use the SUBNET variable instead of hardcoding it in some places. Split commands across multiple lines while at it to improve readability. Related: OS#5802 Change-Id: I08f83089ef97f5f92d4bbfa5743301e7375e9f0f --- M ttcn3-bsc-test-vamos/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh 7 files changed, 45 insertions(+), 11 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index e686710..3f7f1ec 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -60,7 +60,13 @@ --name ${BUILD_TAG}-bts$i -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy $BTS_FEATURES 172.18.31.20 $((i + 1234)) 1 >>/data/osmo-bts-omldummy-${i}.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-bts-omldummy \ + $BTS_FEATURES \ + 172.18.$SUBNET.20 \ + $((i + 1234)) \ + 1 \ + >>/data/osmo-bts-omldummy-${i}.log 2>&1" done echo Starting container with BSC testsuite diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index e402b33..6dac56a 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -51,7 +51,13 @@ --name ${BUILD_TAG}-bts$1 -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy $BTS_FEATURES 172.18.12.20 $(($1 + 1234)) $2 >>/data/osmo-bts-omldummy-$1.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-bts-omldummy \ + $BTS_FEATURES \ + 172.18.$SUBNET.20 \ + $(($1 + 1234)) \ + $2 \ + >>/data/osmo-bts-omldummy-$1.log 2>&1" done echo Starting container with BSC testsuite diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index c018046..2138169 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -60,7 +60,13 @@ --name ${BUILD_TAG}-bts$1 -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy $BTS_FEATURES 172.18.2.20 $(($1 + 1234)) $2 >>/data/osmo-bts-omldummy-$1.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-bts-omldummy \ + $BTS_FEATURES \ + 172.18.$SUBNET.20 \ + $(($1 + 1234)) \ + $2 \ + >>/data/osmo-bts-omldummy-$1.log 2>&1" done echo Starting container with BSC testsuite diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 3438771..3f1f2f1 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -68,10 +68,12 @@ --log-file-level DEBUG \ --log-file-time \ --log-level INFO \ - -R 172.18.9.20 -r 172.18.9.22 \ - --trx TRX1@172.18.9.20:5700/1 \ - --trx TRX2@172.18.9.20:5700/2 \ - --trx TRX3@172.18.9.20:5700/3 >>/data/fake_trx.out 2>&1" + -R 172.18.$SUBNET.20 \ + -r 172.18.$SUBNET.22 \ + --trx TRX1@172.18.$SUBNET.20:5700/1 \ + --trx TRX2@172.18.$SUBNET.20:5700/2 \ + --trx TRX3@172.18.$SUBNET.20:5700/3 \ + >>/data/fake_trx.out 2>&1" } start_trxcon() { @@ -84,7 +86,10 @@ --name ${BUILD_TAG}-trxcon -d \ $DOCKER_ARGS \ $REPO_USER/osmocom-bb-host-master \ - /bin/sh -c "trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 >>/data/trxcon.log 2>&1" + /bin/sh -c "trxcon \ + -i 172.18.$SUBNET.21 \ + -s /data/unix/osmocom_l2 \ + >>/data/trxcon.log 2>&1" } start_virtphy() { diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 4bd2480..dfcf403 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -32,7 +32,11 @@ --name ${BUILD_TAG}-pcu-sns -d \ $DOCKER_ARGS \ $REPO_USER/osmo-pcu-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-pcu -c /data/osmo-pcu.cfg -i 172.18.14.10 >>/data/osmo-pcu.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-pcu \ + -c /data/osmo-pcu.cfg \ + -i 172.18.$SUBNET.10 \ + >>/data/osmo-pcu.log 2>&1" echo Starting container with PCU testsuite docker run --rm \ diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh index 2a6a9d8..b9e74b4 100755 --- a/ttcn3-remsim-test/jenkins.sh +++ b/ttcn3-remsim-test/jenkins.sh @@ -30,7 +30,10 @@ --name ${BUILD_TAG}-bankd -d \ $DOCKER_ARGS \ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \ - /bin/sh -c "pcscd; osmo-remsim-bankd -i 172.18.17.10 >/data/osmo-remsim-bankd.log 2>&1" + /bin/sh -c "pcscd; \ + osmo-remsim-bankd \ + -i 172.18.$SUBNET.10 \ + >/data/osmo-remsim-bankd.log 2>&1" } start_client() { diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index d1a9a11..3a3346a 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -28,7 +28,11 @@ --name ${BUILD_TAG}-stp -d \ $DOCKER_ARGS \ $REPO_USER/osmo-stp-master \ - /bin/sh -c "sccp_demo_user -l 172.18.22.200 -r 172.18.22.203 -C /data/sccp_demo_user.cfg >>/data/sccp_demo_user.log 2>&1" + /bin/sh -c "sccp_demo_user \ + -l 172.18.$SUBNET.200 \ + -r 172.18.$SUBNET.203 \ + -C /data/sccp_demo_user.cfg \ + >>/data/sccp_demo_user.log 2>&1" echo Starting container with SCCP testsuite -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I08f83089ef97f5f92d4bbfa5743301e7375e9f0f Gerrit-Change-Number: 30769 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

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023