diff options
| author |   Cedric Ollivier <ollivier.cedric@gmail.com> | 2016-10-17 07:10:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-17 07:10:10 +0000 |
| commit | 288da283a86007af01c2e71296f8230f6fce07e5 (patch) | |
| tree | 40ea0979206ac91ad31158d62e0f3473ebcaaae4 /ci | |
| parent | 91acddf71dc4fc48506dddc95621705cbe94ffaf (diff) | |
| parent | 6aa929cd8c8a9116c8df23bc0bf4cc76516425e6 (diff) | |
Merge "Remove exit() in ft_utils.execute_command"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/prepare_env.py | 2 | ||||
| -rwxr-xr-x | ci/run_tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/prepare_env.py b/ci/prepare_env.py index 6b1babaa8..e110aa572 100755 --- a/ci/prepare_env.py +++ b/ci/prepare_env.py @@ -223,7 +223,7 @@ def install_rally(): logger.info("Creating Rally environment...") cmd = "rally deployment destroy opnfv-rally" - ft_utils.execute_command(cmd, exit_on_error=False, + ft_utils.execute_command(cmd, error_msg=("Deployment %s does not exist." % DEPLOYMENT_MAME), verbose=False) rally_conf = os_utils.get_credentials_for_rally() diff --git a/ci/run_tests.py b/ci/run_tests.py index af8f51dd0..638a6edf3 100755 --- a/ci/run_tests.py +++ b/ci/run_tests.py @@ -108,7 +108,7 @@ def run_test(test, tier_name): else: cmd = ("%s%s" % (EXEC_SCRIPT, flags)) logger.debug("Executing command '%s'" % cmd) - result = ft_utils.execute_command(cmd, exit_on_error=False) + result = ft_utils.execute_command(cmd) if CLEAN_FLAG: cleanup() |