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

[XS] Change in osmo-ggsn[master]: tun: Use OSMO_TRLCPY_ARRAY
by osmith 25 Oct '24

25 Oct '24

Attention is currently required from: pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/38547?usp=email ) Change subject: tun: Use OSMO_TRLCPY_ARRAY ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ggsn/+/38547/comment/bb85f09c_eb75082e?us… : PS1, Line 7: _TR _STR -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/38547?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I40b370f4152748d5acf6ee576462e54c9a46a8a3 Gerrit-Change-Number: 38547 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 13:58:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: testenv: set MTU=1500 for lo
by pespin 25 Oct '24

25 Oct '24

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38546?usp=email ) Change subject: bsc: testenv: set MTU=1500 for lo ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: what? this makes no sense sorry, the BSC is doing nothing related to MTU so we really need to figure out what's going on here instead of masking the error. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38546?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: Ifeda66954263fe8d2637377d0701a2208a19c332 Gerrit-Change-Number: 38546 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 13:53:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: remove dead code for [testsuite] prepare=
by osmith 25 Oct '24

25 Oct '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38531?usp=email ) Change subject: testenv: remove dead code for [testsuite] prepare= ...................................................................... testenv: remove dead code for [testsuite] prepare= Remove some WIP code that I intended to use for enabling the mongodb repository before installing binary packages, to be able to dynamically install mongodb from there. I solved it differently by just always having mongodb in the podman image. This was a dead code path because configs with prepare= in [testsuite] are currently not valid, and therefore testenv refuses to use these configs (see keys_valid_testsuite in testenv_cfg.py's verify()). I have a different use case for running prepare= before running the testsuite, to replace a module parameter in the testsuite's config. This will be done in the next patch. Change-Id: I9bed48612fad690f86017c298372dc6cea22b94b --- M _testenv/testenv.py M _testenv/testenv/testsuite.py 2 files changed, 0 insertions(+), 14 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/_testenv/testenv.py b/_testenv/testenv.py index e1f1210..23a2922 100755 --- a/_testenv/testenv.py +++ b/_testenv/testenv.py @@ -38,11 +38,6 @@ testenv.testsuite.init() testenv.testsuite.build() - # Run prepare functions of testsuites (may enable extra repos) - for cfg_name, cfg in testenv.testenv_cfg.cfgs.items(): - testenv.testenv_cfg.set_current(cfg_name) - testenv.testsuite.run_prepare_script(cfg) - # Build all components first if not testenv.args.binary_repo: for cfg_name, cfg in testenv.testenv_cfg.cfgs.items(): diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index 7fc4344..601f339 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -205,15 +205,6 @@ format_log_files(cfg) -def run_prepare_script(cfg): - section_data = cfg["testsuite"] - if "prepare" not in section_data: - return - - logging.info("Running testsuite prepare script") - testenv.cmd.run(section_data["prepare"]) - - def get_current_test(): path = os.path.join(testenv.testdir.testdir, "testsuite/.current_test") try: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38531?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: I9bed48612fad690f86017c298372dc6cea22b94b Gerrit-Change-Number: 38531 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]: testenv: add proper [testsuite] prepare= support
by osmith 25 Oct '24

25 Oct '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38532?usp=email ) Change subject: testenv: add proper [testsuite] prepare= support ...................................................................... testenv: add proper [testsuite] prepare= support Support using prepare= in the [testsuite] section to e.g. change module parameters: [testsuite] prepare=sed -i 's/mp_my_parameter := false/mp_my_parameter := true/' Testsuite.cfg Move the execution time of prepare and clean scripts in testdir.prepare() after the testsuite config has been copied to the testdir, so it can be modified by the prepare script. Change-Id: Ia78a4eba061e5e070f156f75eae1dfa4cede1ee3 --- M _testenv/README.md M _testenv/testenv/testdir.py M _testenv/testenv/testenv_cfg.py 3 files changed, 23 insertions(+), 10 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/README.md b/_testenv/README.md index 3fed9c9..bd102a8 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -70,6 +70,10 @@ directory, useful for include files mentioned in the config. Multiple values are separated by spaces. +* `prepare=`: optional script to run before staring the testsuite (after files + are copied to the test directory). This can be used to change module + parameters in the testsuite's config. + * `clean=`: optional script to run before running the testsuite and on exit. This can be used to clean up network devices for example, or to fix name collisions when running a test with multiple configs diff --git a/_testenv/testenv/testdir.py b/_testenv/testenv/testdir.py index aa0ba47..88a2dca 100644 --- a/_testenv/testenv/testdir.py +++ b/_testenv/testenv/testdir.py @@ -94,16 +94,6 @@ mode = 755 if os.access(path, os.X_OK) else 644 testenv.cmd.run(["install", f"-Dm{mode}", path, path_dest]) - if "clean" in section_data: - logging.info(f"Running {section} clean script (reason: prepare)") - clean_scripts[section] = section_data["clean"] - env = {"TESTENV_CLEAN_REASON": "prepare"} - testenv.cmd.run(section_data["clean"], cwd=section_dir, env=env) - - if "prepare" in section_data: - logging.info(f"Running {section} prepare script") - testenv.cmd.run(section_data["prepare"], cwd=section_dir) - # Referenced in testsuite cfgs: *.default pattern = os.path.join(testsuite_dir, "*.default") for path in glob.glob(pattern): @@ -147,6 +137,24 @@ ] ) + # Run prepare and clean scripts + for section in cfg: + if section in ["DEFAULT"]: + continue + + section_data = cfg[section] + section_dir = os.path.join(testdir, section) + + if "clean" in section_data: + logging.info(f"Running {section} clean script (reason: prepare)") + clean_scripts[section] = section_data["clean"] + env = {"TESTENV_CLEAN_REASON": "prepare"} + testenv.cmd.run(section_data["clean"], cwd=section_dir, env=env) + + if "prepare" in section_data: + logging.info(f"Running {section} prepare script") + testenv.cmd.run(section_data["prepare"], cwd=section_dir) + def clean(): """Don't leave behind an empty testdir_topdir, e.g. if testenv.py aborted diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index ea25614..fefaf5c 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -109,6 +109,7 @@ "clean", "config", "copy", + "prepare", "program", ] keys_valid_component = [ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38532?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: Ia78a4eba061e5e070f156f75eae1dfa4cede1ee3 Gerrit-Change-Number: 38532 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

[XS] Change in pysim[master]: pySim-shell_test/utils: display pySim-shell logfile content
by osmith 25 Oct '24

25 Oct '24

Attention is currently required from: dexter. osmith has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38545?usp=email ) Change subject: pySim-shell_test/utils: display pySim-shell logfile content ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38545?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibf6f78d7e71c213c7ca1caaf21c4c890e892261e Gerrit-Change-Number: 38545 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 13:51:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ggsn[master]: tun: Use OSMO_TRLCPY_ARRAY
by fixeria 25 Oct '24

25 Oct '24

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/38547?usp=email ) Change subject: tun: Use OSMO_TRLCPY_ARRAY ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/38547?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I40b370f4152748d5acf6ee576462e54c9a46a8a3 Gerrit-Change-Number: 38547 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 13:51:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in pysim[master]: pySim-shell_test/utils: enumerate pySim-shell logs
by osmith 25 Oct '24

25 Oct '24

Attention is currently required from: dexter. osmith has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38544?usp=email ) Change subject: pySim-shell_test/utils: enumerate pySim-shell logs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38544?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib2195d9b2231f74d0a6c4fb28f4889b6c45efb1e Gerrit-Change-Number: 38544 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 13:50:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in pysim[master]: pySim-shell_test/utils: delete log files in general
by osmith 25 Oct '24

25 Oct '24

Attention is currently required from: dexter. osmith has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38543?usp=email ) Change subject: pySim-shell_test/utils: delete log files in general ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I09dc7e59d1a3dcb68f54e3a8dccb86a1bc6c9ee6 Gerrit-Change-Number: 38543 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 13:50:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ggsn[master]: tun: Use OSMO_TRLCPY_ARRAY
by pespin 25 Oct '24

25 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/38547?usp=email ) Change subject: tun: Use OSMO_TRLCPY_ARRAY ...................................................................... tun: Use OSMO_TRLCPY_ARRAY tun->devname buffer is already IFNAMSIZ bytes long, so simplify the code. Change-Id: I40b370f4152748d5acf6ee576462e54c9a46a8a3 --- M lib/tun.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/47/38547/1 diff --git a/lib/tun.c b/lib/tun.c index 89fe292..60d9b5e 100644 --- a/lib/tun.c +++ b/lib/tun.c @@ -44,6 +44,7 @@ #include <linux/if_tun.h> #include <osmocom/core/msgb.h> +#include <osmocom/core/utils.h> #include "tun.h" #include "syserr.h" @@ -107,8 +108,7 @@ tun->addrs = 0; tun->tundev.fd = -1; - osmo_strlcpy(tun->devname, devname, IFNAMSIZ); - tun->devname[IFNAMSIZ - 1] = 0; + OSMO_STRLCPY_ARRAY(tun->devname, devname); return tun; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/38547?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I40b370f4152748d5acf6ee576462e54c9a46a8a3 Gerrit-Change-Number: 38547 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in pysim[master]: global_platform: ensure ArgumentParser gets a list for choices
by osmith 25 Oct '24

25 Oct '24

Attention is currently required from: dexter. osmith has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38542?usp=email ) Change subject: global_platform: ensure ArgumentParser gets a list for choices ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38542?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I165fefd8feb0d96cedc15d036fb32da381f711b3 Gerrit-Change-Number: 38542 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 13:48:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0