diff options
author | jose.lausuch <jose.lausuch@ericsson.com> | 2016-05-04 11:47:40 +0200 |
---|---|---|
committer | jose.lausuch <jose.lausuch@ericsson.com> | 2016-05-04 14:35:07 +0200 |
commit | 6790e17eb7c1a3eaaccfe97ac90932e3c15eea6d (patch) | |
tree | 06697206e1323dd3acdce742a2e1e5d5bb4b232f /testcases/vPing/CI | |
parent | 7ad2ce42a2bc2c8dc17fbc9423da71a95fed4d87 (diff) |
Refactor improvements
JIRA: FUNCTEST-190
- Deleted unnecessary old scripts
- Fixed healtcheck logging
- Moved config_functest.yaml to /ci/
- Created env var CONFIG_FUNCTEST_YAML pointing to that new location
- Modified all scripts which open config_functest.yaml using the new env var
Change-Id: Ic4f0e40a70c02ac08287a1d621956f602bdee177
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'testcases/vPing/CI')
-rw-r--r-- | testcases/vPing/CI/libraries/vPing_ssh.py | 2 | ||||
-rw-r--r-- | testcases/vPing/CI/libraries/vPing_userdata.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/testcases/vPing/CI/libraries/vPing_ssh.py b/testcases/vPing/CI/libraries/vPing_ssh.py index 23b3d46f8..bd0b9b291 100644 --- a/testcases/vPing/CI/libraries/vPing_ssh.py +++ b/testcases/vPing/CI/libraries/vPing_ssh.py @@ -54,7 +54,7 @@ if not os.path.exists(REPO_PATH): logger.error("Functest repository directory not found '%s'" % REPO_PATH) exit(-1) -with open("/home/opnfv/functest/conf/config_functest.yaml") as f: +with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: functest_yaml = yaml.safe_load(f) f.close() diff --git a/testcases/vPing/CI/libraries/vPing_userdata.py b/testcases/vPing/CI/libraries/vPing_userdata.py index 3e69ddfe0..473c1f823 100644 --- a/testcases/vPing/CI/libraries/vPing_userdata.py +++ b/testcases/vPing/CI/libraries/vPing_userdata.py @@ -50,7 +50,7 @@ if not os.path.exists(REPO_PATH): logger.error("Functest repository directory not found '%s'" % REPO_PATH) exit(-1) -with open("/home/opnfv/functest/conf/config_functest.yaml") as f: +with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f: functest_yaml = yaml.safe_load(f) f.close() |