osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37884?usp=email ) Change subject: testenv: cmd: pass all env vars without --podman ...................................................................... testenv: cmd: pass all env vars without --podman As suggested by Pau, pass all environment variables to through testenv if it is running without podman. This way a custom TTCN3_DIR, TTCN3_BIN_DIR and more variables that may make sense when running directly on the host, work as expected. Closes: OS#6544 Change-Id: I5e710a1ee7185a3f6f4f1e98f201f3f6fda2be55 --- M _testenv/testenv/cmd.py 1 file changed, 7 insertions(+), 0 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 cb8386a..6f502fc 100644 --- a/_testenv/testenv/cmd.py +++ b/_testenv/testenv/cmd.py @@ -78,6 +78,13 @@ for var in env: ret[var] = env[var] + + # Without podman: pass all environment variables from host (OS#6544) + if not podman: + for var in os.environ: + if var not in ret: + ret[var] = os.environ.get(var) + return ret -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37884?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: I5e710a1ee7185a3f6f4f1e98f201f3f6fda2be55 Gerrit-Change-Number: 37884 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>