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>