osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43847?usp=email ) Change subject: testenv: use proper envtype for testsuite (no -b) ...................................................................... testenv: use proper envtype for testsuite (no -b) Fix that the testsuite was always running with the binary_repo envtype, even if running without --binary-repo. This had the effect that PATH was not set correctly to execute test components built with osmo-dev from the testsuite, which broke the ipad testsuite. Fixes: b728a7fb ("testenv: cmd: init_env: split up by envtype") Change-Id: Ia44ec060818adcb97038043a9c6a0328c1831a15 --- M _testenv/testenv/testsuite.py 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index b1bd8a8..52886cf 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -44,7 +44,8 @@ cache_dir = "podman" if testenv.args.podman else "host" suffix = testenv.cmd.distro_cache_suffix() builddir = os.path.join(testenv.args.cache, cache_dir, f"titan-{titan_version}{suffix}") - path_old = testenv.cmd.generate_env(podman=testenv.args.podman)["PATH"] + envtype = "binary_repo" if testenv.args.binary_repo else "osmo_dev" + path_old = testenv.cmd.generate_env(podman=testenv.args.podman, envtype=envtype)["PATH"] builddir_env = { "BUILDDIR": builddir, "TTCN3_DIR": ttcn3_dir, @@ -155,7 +156,8 @@ if testenv.args.fast: env["TESTENV_FAST"] = "1" - env = testenv.cmd.generate_env(env, testenv.args.podman) + envtype = "binary_repo" if testenv.args.binary_repo else "osmo_dev" + env = testenv.cmd.generate_env(env, testenv.args.podman, envtype) cmd = [start_testsuite, suite, section_data["config"]] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43847?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: Ia44ec060818adcb97038043a9c6a0328c1831a15 Gerrit-Change-Number: 43847 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: osmith <osmith@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de>