- gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: OBS: update_obs_eclipse_titan: update
by osmith 27 May '25

27 May '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/40382?usp=email ) Change subject: OBS: update_obs_eclipse_titan: update ...................................................................... OBS: update_obs_eclipse_titan: update * Set the branch as argument instead of hardcoding it. * Don't use --version-append, the ~osmocom part will be added to debian/changelog instead when pushing new versions. * Add usage description. Change-Id: I6580ce81e092299850f177110e130ac1847e05a7 --- M scripts/obs/update_obs_eclipse_titan.sh 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/82/40382/1 diff --git a/scripts/obs/update_obs_eclipse_titan.sh b/scripts/obs/update_obs_eclipse_titan.sh index 6efb7c6..2439777 100755 --- a/scripts/obs/update_obs_eclipse_titan.sh +++ b/scripts/obs/update_obs_eclipse_titan.sh @@ -3,7 +3,15 @@ DIR="$(realpath "$(dirname "$0")")" PROJ="$1" GIT_URL="https://gitea.osmocom.org/osmith/titan.core" -CHECKOUT="osmocom/9.0.0" +CHECKOUT="$2" + +if [ $# != 2 ]; then + echo "usage:" + echo " update_obs_eclipse_titan.sh PROJ CHECKOUT" + echo "example:" + echo " update_obs_eclipse_titan.sh home:osmith:latest osmocom/11.0.0" + exit 1 +fi prepare_git_repo() { cd "$DIR" @@ -27,7 +35,6 @@ --allow-unknown-package \ --git-skip-checkout \ --git-skip-fetch \ - --version-append "~osmocom" \ "$PROJ" \ eclipse-titan } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/40382?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6580ce81e092299850f177110e130ac1847e05a7 Gerrit-Change-Number: 40382 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: use eclipse-titan 11 in Dockerfile
by pespin 27 May '25

27 May '25

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40381?usp=email ) Change subject: testenv: use eclipse-titan 11 in Dockerfile ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40381?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I660dd6ca93a54087b1d41787c4ed2b64a3ad0437 Gerrit-Change-Number: 40381 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 May 2025 13:59:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: use eclipse-titan 11 in Dockerfile
by osmith 27 May '25

27 May '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40381?usp=email ) Change subject: testenv: use eclipse-titan 11 in Dockerfile ...................................................................... testenv: use eclipse-titan 11 in Dockerfile Install eclipse-titan from osmocom:nightly instead of osmocom:latest, which now has version 11. Once we ensured everything works as expected, we will upgrade the version in osmocom:latest too. Change-Id: I660dd6ca93a54087b1d41787c4ed2b64a3ad0437 --- M _testenv/data/podman/Dockerfile 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/40381/1 diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 097fdc4..8b8432c 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -4,7 +4,7 @@ # Arguments used after FROM must be specified again ARG OSMOCOM_REPO_TESTSUITE_MIRROR="https://downloads.osmocom.org" -ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/latest/Debian_12/" +ARG OSMOCOM_REPO="$OSMOCOM_REPO_TESTSUITE_MIRROR/packages/osmocom:/nightly/Debian_12/" # Copy from common dir COPY obs.key /obs.key @@ -121,9 +121,9 @@ pip3 install ./osmo-python-tests --break-system-packages && \ rm -rf osmo-python-tests -# Add eclipse-titan from osmocom:latest, invalidate cache when :latest changes +# Add eclipse-titan from osmocom:nightly, invalidate cache when :nightly changes RUN echo "deb [signed-by=/obs.key] $OSMOCOM_REPO ./" \ - > /etc/apt/sources.list.d/osmocom-latest.list + > /etc/apt/sources.list.d/osmocom-nightly.list ADD $OSMOCOM_REPO/Release /tmp/Release RUN set -x && \ apt-get update && \ @@ -131,7 +131,7 @@ eclipse-titan \ && \ apt-get clean && \ - rm /etc/apt/sources.list.d/osmocom-latest.list + rm /etc/apt/sources.list.d/osmocom-nightly.list # Add mongodb for open5gs-hss. Using the package from bullseye since bookworm # mongodb-org package is not available. Furthermore, manually install required -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40381?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I660dd6ca93a54087b1d41787c4ed2b64a3ad0437 Gerrit-Change-Number: 40381 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[L] Change in ...osmo-s1gw[master]: enft_kpi: retrieve per-eNB traffic counters
by fixeria 27 May '25

27 May '25

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40281?usp=email ) Change subject: enft_kpi: retrieve per-eNB traffic counters ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I498d2854447a2d53d2abddd38652f3e2bbb1fbdd Gerrit-Change-Number: 40281 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 27 May 2025 13:24:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[XS] Change in ...osmo-s1gw[master]: debian: drop unneeded libpcap-dev
by fixeria 27 May '25

27 May '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40348?usp=email ) Change subject: debian: drop unneeded libpcap-dev ...................................................................... debian: drop unneeded libpcap-dev Change-Id: I4c152b6f5f517acccfe4aa856447c59eb1212707 --- M debian/control 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian/control b/debian/control index 4062ee8..a4279b7 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Section: net Priority: optional Build-Depends: erlang-nox, - libpcap-dev, rebar3, debhelper (>= 10) Standards-Version: 4.5.0 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40348?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I4c152b6f5f517acccfe4aa856447c59eb1212707 Gerrit-Change-Number: 40348 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: s1ap_proxy: parse and store Global-ENB-ID IE
by fixeria 27 May '25

27 May '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40368?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: s1ap_proxy: parse and store Global-ENB-ID IE ...................................................................... s1ap_proxy: parse and store Global-ENB-ID IE This commit prepares for a follow-up change implementing the NFT-based KPI (GTP-U packets/bytes stats) reporting, which will need the Global-ENB-ID. Change-Id: Icc24d4daf06d161d7b5b386456e8e92ac07d5eba Related: SYS#7307 --- M src/s1ap_proxy.erl 1 file changed, 56 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 774fc66..bf5f849 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -67,8 +67,12 @@ -type enb_ue_id() :: 0..16#ffffff. -type erab_id() :: 0..16#ff. -type erab_uid() :: {mme_ue_id(), enb_ue_id(), erab_id()}. +-type plmn_id() :: {MCC :: nonempty_string(), + MNC :: nonempty_string()}. -record(proxy_state, {erabs :: dict:dict(), + enb_id :: undefined | non_neg_integer(), + plmn_id :: undefined | plmn_id(), mme_ue_id :: undefined | mme_ue_id(), enb_ue_id :: undefined | enb_ue_id(), erab_id :: undefined | erab_id(), @@ -195,6 +199,35 @@ ok. +%% Parse PLMN-ID as per 3GPP TS 24.008, Figure 10.5.13 +%% | MCC digit 2 | MCC digit 1 | octet 1 +%% | MNC digit 3 | MCC digit 3 | octet 2 +%% | MNC digit 2 | MNC digit 1 | octet 3 +-spec parse_plmn_id(<< _:24 >>) -> plmn_id(). +parse_plmn_id(<< MCC2:4, MCC1:4, + MNC3:4, MCC3:4, + MNC2:4, MNC1:4 >>) -> + MCC = parse_mcc_mnc(MCC1, MCC2, MCC3), + MNC = parse_mcc_mnc(MNC1, MNC2, MNC3), + {MCC, MNC}. + + +-define(UNHEX(H), H + 48). + +parse_mcc_mnc(D1, D2, 16#f) -> + [?UNHEX(D1), ?UNHEX(D2)]; + +parse_mcc_mnc(D1, D2, D3) -> + [?UNHEX(D1), ?UNHEX(D2), ?UNHEX(D3)]. + + +-spec parse_enb_id(tuple()) -> non_neg_integer(). +parse_enb_id({'macroENB-ID', << ID:20 >>}) -> ID; +parse_enb_id({'homeENB-ID', << ID:28 >>}) -> ID; +parse_enb_id({'short-macroENB-ID', << ID:18 >>}) -> ID; +parse_enb_id({'long-macroENB-ID', << ID:21 >>}) -> ID. + + %% Encode an S1AP PDU -spec encode_pdu(s1ap_pdu()) -> {ok, binary()} | {error, {asn1, tuple()}}. @@ -260,6 +293,17 @@ -spec handle_pdu(s1ap_pdu(), proxy_state()) -> {{proxy_action(), s1ap_pdu()}, proxy_state()} | {forward, proxy_state()}. +%% 9.1.8.4 S1 SETUP REQUEST +handle_pdu({initiatingMessage, + #'InitiatingMessage'{procedureCode = ?'id-S1Setup', + value = C0}}, S0) -> + ?LOG_DEBUG("Processing S1 SETUP REQUEST"), + %% there's nothing to patch in this PDU, so we forward it as-is + %% TODO: check result of handle_ies(), inc. ?S1GW_CTR_S1AP_PROXY_IN_PKT_PROC_ERROR + {_, S1} = handle_ies(?'id-Global-ENB-ID', + C0#'S1SetupRequest'.protocolIEs, S0), + {forward, S1}; + %% 9.1.3.1 E-RAB SETUP REQUEST handle_pdu({Outcome = initiatingMessage, #'InitiatingMessage'{procedureCode = ?'id-E-RABSetup', @@ -538,6 +582,18 @@ Result :: {handle_ie_result(), proxy_state()}. +handle_ie([?'id-Global-ENB-ID'], + #'Global-ENB-ID'{'pLMNidentity' = PLMNId, + 'eNB-ID' = ENBId} = C, S0) -> + %% store PLMNId/ENBId + %% TODO: use that as a context for logging + S1 = S0#proxy_state{plmn_id = parse_plmn_id(PLMNId), + enb_id = parse_enb_id(ENBId)}, + ?LOG_INFO("Global-ENB-ID: PLMN-ID=~p, eNB-ID=~p", + [S1#proxy_state.plmn_id, + S1#proxy_state.enb_id]), + {{ok, C}, S1}; + %% E-RAB SETUP REQUEST related IEs handle_ie([?'id-E-RABToBeSetupListBearerSUReq'], C, S) -> %% This IE contains a list of BearerSUReq, so patch inner IEs -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40368?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Icc24d4daf06d161d7b5b386456e8e92ac07d5eba Gerrit-Change-Number: 40368 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: erab_fsm: clarify type spec for teid_addr()
by fixeria 27 May '25

27 May '25

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40377?usp=email ) Change subject: erab_fsm: clarify type spec for teid_addr() ...................................................................... erab_fsm: clarify type spec for teid_addr() Change-Id: If649c3436ce60d3b9ceefdcfb695bb2236ebe7ef --- M src/erab_fsm.erl 1 file changed, 2 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/erab_fsm.erl b/src/erab_fsm.erl index a941152..cd4fa27 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -73,8 +73,8 @@ -type teid() :: 0..16#ffffffff. -type addr() :: << _:32 >> | << _:128 >>. --type teid_addr() :: {teid(), %% GTP-U TEID - addr() %% GTP-U Transport Layer Address +-type teid_addr() :: {TEID :: teid(), %% GTP-U TEID + Addr :: addr() %% GTP-U Transport Layer Address }. -type mod_kind() :: setup_rsp | -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40377?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If649c3436ce60d3b9ceefdcfb695bb2236ebe7ef Gerrit-Change-Number: 40377 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: erab_fsm: clarify type spec for teid_addr()
by fixeria 27 May '25

27 May '25

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40377?usp=email ) Change subject: erab_fsm: clarify type spec for teid_addr() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40377?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: If649c3436ce60d3b9ceefdcfb695bb2236ebe7ef Gerrit-Change-Number: 40377 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 27 May 2025 13:13:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: deduplicate make_dir
by osmith 27 May '25

27 May '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40378?usp=email ) Change subject: testenv: deduplicate make_dir ...................................................................... testenv: deduplicate make_dir Generate the osmo-dev make dir path in one location, in testenv.cmd which gets imported by testenv.osmo_dev instead of doing it in both. This makes it easier to bump make_dir_version when necessary. Change-Id: Id3cb30e1ea126daf04dac227a2bf39b746549ec9 --- M _testenv/testenv/cmd.py M _testenv/testenv/osmo_dev.py 2 files changed, 12 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/_testenv/testenv/cmd.py b/_testenv/testenv/cmd.py index 9a81e30..5da27fe 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -9,6 +9,9 @@ env_extra = {} install_dir = None +make_dir = None +# osmo-dev make dir version, bump when making incompatible changes +make_dir_version = 2 def init_env(): @@ -16,6 +19,7 @@ changes here.""" global env_extra global install_dir + global make_dir if testenv.args.podman: if testenv.args.binary_repo: @@ -48,9 +52,11 @@ if not testenv.args.binary_repo: if testenv.args.podman: - env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "podman", "make2") + make_dir = os.path.join(testenv.args.cache, "podman", "make") else: - env_extra["OSMO_DEV_MAKE_DIR"] = os.path.join(testenv.args.cache, "host", "make2") + make_dir = os.path.join(testenv.args.cache, "host", "make") + make_dir += str(make_dir_version) + env_extra["OSMO_DEV_MAKE_DIR"] = make_dir if testenv.args.kernel == "debian": env_extra["TESTENV_QEMU_KERNEL"] = "debian" diff --git a/_testenv/testenv/osmo_dev.py b/_testenv/testenv/osmo_dev.py index 02fe2e8..8b83367 100644 --- a/_testenv/testenv/osmo_dev.py +++ b/_testenv/testenv/osmo_dev.py @@ -7,7 +7,6 @@ import testenv import testenv.cmd -make_dir = None init_done = False @@ -54,20 +53,17 @@ def init(): global init_done - global make_dir if init_done: return extra_opts = [] if testenv.args.podman: - make_dir = os.path.join(testenv.args.cache, "podman", "make") extra_opts = [ "--install-prefix", os.path.join(testenv.args.cache, "podman/usr"), ] else: - make_dir = os.path.join(testenv.args.cache, "host", "make") extra_opts = [ "--install-prefix", os.path.join(testenv.args.cache, "host/usr"), @@ -76,17 +72,13 @@ if testenv.args.jobs: extra_opts += [f"-j{testenv.args.jobs}"] - # Make dirs created without passing --autoreconf-in-src-copy to - # gen_makefile.py (as previous versions of testenv did) are incompatible. - # Add the "2" to avoid potential conflicts. - make_dir += "2" - + # Bump testenv.cmd.make_dir_version when making incompatible changes cmd = [ "./gen_makefile.py", "--build-debug", "--no-make-check", "--make-dir", - make_dir, + testenv.cmd.make_dir, "--no-ldconfig", "--src-dir", testenv.src_dir, @@ -135,7 +127,7 @@ logging.debug("No osmo-dev make targets found in testenv.cfg") return - makefile_path = os.path.join(make_dir, "Makefile") + makefile_path = os.path.join(testenv.cmd.make_dir, "Makefile") with open(makefile_path) as f: makefile = f.read() @@ -152,4 +144,4 @@ sys.exit(1) logging.info("Building test components") - testenv.cmd.run(["make"] + targets, cwd=make_dir) + testenv.cmd.run(["make"] + targets, cwd=testenv.cmd.make_dir) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40378?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id3cb30e1ea126daf04dac227a2bf39b746549ec9 Gerrit-Change-Number: 40378 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>

1 0

[S] Change in osmo-ttcn3-hacks[master]: 5gc: testenv: use TESTENV_INSTALL_DIR
by osmith 27 May '25

27 May '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40380?usp=email ) Change subject: 5gc: testenv: use TESTENV_INSTALL_DIR ...................................................................... 5gc: testenv: use TESTENV_INSTALL_DIR Change-Id: I412e53d132957a877a9a0478df3ac2fe31327a6c --- M 5gc/open5gs/open5gs_prepare.sh 1 file changed, 2 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/5gc/open5gs/open5gs_prepare.sh b/5gc/open5gs/open5gs_prepare.sh index 2946f21..7378980 100755 --- a/5gc/open5gs/open5gs_prepare.sh +++ b/5gc/open5gs/open5gs_prepare.sh @@ -1,20 +1,7 @@ #!/bin/sh -ex -set_ogs_sysconf_dir() { - if [ -z "$OSMO_DEV_MAKE_DIR" ]; then - # With --binary-repo - OGS_INSTALL_DIR="/" - OGS_SYSCONF_DIR="$OGS_INSTALL_DIR/etc/" - else - # Without --binary-repo - OGS_INSTALL_DIR="$OSMO_DEV_MAKE_DIR"/.. - OGS_SYSCONF_DIR="$OGS_INSTALL_DIR/usr/etc/" - fi -} - adjust_sysconfdir_config() { - sed -i "s~@sysconfdir@~$1~g" $2 + sed -i "s~@sysconfdir@~$TESTENV_INSTALL_DIR/etc/~g" $1 } -set_ogs_sysconf_dir -adjust_sysconfdir_config "$OGS_SYSCONF_DIR" ./*.yaml +adjust_sysconfdir_config ./*.yaml -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40380?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I412e53d132957a877a9a0478df3ac2fe31327a6c Gerrit-Change-Number: 40380 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>

1 0

2026

2025

2024

2023

2022

gerrit-log