Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Push ODL results to DB"
[functest.git]
/
testcases
/
config_functest.py
diff --git
a/testcases/config_functest.py
b/testcases/config_functest.py
index
1168258
..
70a7d6c
100755
(executable)
--- a/
testcases/config_functest.py
+++ b/
testcases/config_functest.py
@@
-125,7
+125,10
@@
def action_start():
script += 'bundle install'
cmd = "/bin/bash -c '" + script + "'"
script += 'bundle install'
cmd = "/bin/bash -c '" + script + "'"
- functest_utils.execute_command(cmd,logger)
+ if os.environ.get("CI_DEBUG") == "false":
+ functest_utils.execute_command(cmd)
+ else:
+ functest_utils.execute_command(cmd,logger)
# Create result folder under functest if necessary
if not os.path.exists(RALLY_RESULT_DIR):
# Create result folder under functest if necessary
if not os.path.exists(RALLY_RESULT_DIR):
@@
-208,7
+211,7
@@
def action_clean():
logger.debug("Cleaning up the OpenStack deployment...")
cmd='python ' + REPO_PATH + \
logger.debug("Cleaning up the OpenStack deployment...")
cmd='python ' + REPO_PATH + \
- '/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py -
d
'
+ '/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py -
-debug
'
functest_utils.execute_command(cmd,logger)
logger.info("Functest environment clean!")
functest_utils.execute_command(cmd,logger)
logger.info("Functest environment clean!")
@@
-221,7
+224,10
@@
def install_rally():
logger.debug("Executing %s/install_rally.sh..." %RALLY_REPO_DIR)
install_script = RALLY_REPO_DIR + "/install_rally.sh --yes"
cmd = 'sudo ' + install_script
logger.debug("Executing %s/install_rally.sh..." %RALLY_REPO_DIR)
install_script = RALLY_REPO_DIR + "/install_rally.sh --yes"
cmd = 'sudo ' + install_script
- functest_utils.execute_command(cmd,logger)
+ if os.environ.get("CI_DEBUG") == "false":
+ functest_utils.execute_command(cmd)
+ else:
+ functest_utils.execute_command(cmd,logger)
logger.debug("Creating Rally environment...")
cmd = "rally deployment create --fromenv --name="+DEPLOYMENT_MAME
logger.debug("Creating Rally environment...")
cmd = "rally deployment create --fromenv --name="+DEPLOYMENT_MAME