diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2015-12-16 23:44:58 +0100 |
|---|---|---|
| committer | jose.lausuch <jose.lausuch@ericsson.com> | 2015-12-17 00:28:34 +0100 |
| commit | 9ce78e3f50d09fede33ddf85bb5b3da691e04ba2 (patch) | |
| tree | f650c973477bd27e8eaa338a1e958ebd3d02bb8f | |
| parent | c78da1f92e1e9d4e81999ad3362b92c219abdf48 (diff) | |
Add clean_openstack script call in clean functest environment
Reason: sometimes, if you run functest, it creates openstack stuff
and fails, when you run it the second time it can fail if
it tries to create the same openstack stuff
Change-Id: I1825a02918f188c409398d2b6b95843d7fdd5993
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
| -rwxr-xr-x | testcases/config_functest.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/testcases/config_functest.py b/testcases/config_functest.py index 11b31c9e8..1d834bb37 100755 --- a/testcases/config_functest.py +++ b/testcases/config_functest.py @@ -47,8 +47,6 @@ with open(args.repo_path+"testcases/config_functest.yaml") as f: f.close() - - """ global variables """ # Directories REPO_PATH = args.repo_path @@ -195,7 +193,11 @@ def action_clean(): logger.debug("Removing Result directory") shutil.rmtree(RALLY_RESULT_DIR,ignore_errors=True) - + logger.debug("Cleaning up the OpenStack deployment...") + cmd='python ' + args.repo_path + \ + '/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py -d ' \ + +args.repo_path + functest_utils.execute_command(cmd,logger) logger.info("Functest environment clean!") |