From 50bb4b244c35242fc0cd24c4c79edcc0244a951d Mon Sep 17 00:00:00 2001 From: Michael Basnight Date: Wed, 1 Apr 2020 12:00:44 -0500 Subject: [PATCH 1/2] Add an override for the rally homedir --- it/__init__.py | 4 +++- tox.ini | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/it/__init__.py b/it/__init__.py index 5dccf7afe..0876c9602 100644 --- a/it/__init__.py +++ b/it/__init__.py @@ -166,7 +166,9 @@ def copy_config(name): with open(f.target_path, "w", encoding="UTF-8") as target: with open(f.source_path, "r", encoding="UTF-8") as src: contents = src.read() - target.write(Template(contents).substitute(USER_HOME=f.user_home)) + # optionally allow for a homedir override in integration tests + user_home = os.getenv("OVERRIDE_RALLY_HOME", f.user_home) + target.write(Template(contents).substitute(USER_HOME=user_home)) for n in CONFIG_NAMES: copy_config(n) diff --git a/tox.ini b/tox.ini index c33a34cec..a8c3b7642 100644 --- a/tox.ini +++ b/tox.ini @@ -21,6 +21,7 @@ passenv = JAVA12_HOME JAVA13_HOME SSH_AUTH_SOCK + OVERRIDE_RALLY_HOME # we do not pass LANG and LC_ALL anymore in order to isolate integration tests # from the test environment. Rally needs to enforce UTF-8 encoding in every # place so we intentionally set LC_ALL to C. From 4f7788c5293e9eaa1994f55a83bd6d6f10e3ba3d Mon Sep 17 00:00:00 2001 From: Michael Basnight Date: Wed, 1 Apr 2020 12:14:18 -0500 Subject: [PATCH 2/2] alpha --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index a8c3b7642..e8fa8e6a3 100644 --- a/tox.ini +++ b/tox.ini @@ -20,8 +20,8 @@ passenv = JAVA11_HOME JAVA12_HOME JAVA13_HOME - SSH_AUTH_SOCK OVERRIDE_RALLY_HOME + SSH_AUTH_SOCK # we do not pass LANG and LC_ALL anymore in order to isolate integration tests # from the test environment. Rally needs to enforce UTF-8 encoding in every # place so we intentionally set LC_ALL to C.