diff options
author | 2016-01-29 13:18:48 +0000 | |
---|---|---|
committer | 2016-01-29 13:18:48 +0000 | |
commit | 4aa74fa23280f579dff45b96fe11b005da3c0ee1 (patch) | |
tree | 0a993191e7da0127bf1818e8da871d6eb078746b /testcases/vIMS/CI/orchestrator.py | |
parent | 175fbd244916dd77c0935f63322c03f449efbef7 (diff) | |
parent | 88b5022795d071a3607133bf534bf5d43d1c9514 (diff) |
Merge "Add some error result in result db api" into stable/brahmaputra
Diffstat (limited to 'testcases/vIMS/CI/orchestrator.py')
-rw-r--r-- | testcases/vIMS/CI/orchestrator.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/testcases/vIMS/CI/orchestrator.py b/testcases/vIMS/CI/orchestrator.py index 382fbd139..965c2646d 100644 --- a/testcases/vIMS/CI/orchestrator.py +++ b/testcases/vIMS/CI/orchestrator.py @@ -106,7 +106,9 @@ class orchestrator: script += "pip install -r requirements.txt; " script += "timeout 1800 cfy bootstrap --install-plugins -p openstack-manager-blueprint.yaml -i inputs.yaml; " cmd = "/bin/bash -c '" + script + "'" - execute_command(cmd, self.logger) + error = execute_command(cmd, self.logger) + if error: + return error if self.logger: self.logger.info("Cloudify-manager server is UP !") @@ -160,8 +162,9 @@ class orchestrator: script += "cfy executions start -w install -d " + dep_name + " --timeout 1800; " cmd = "/bin/bash -c '" + script + "'" - execute_command(cmd, self.logger) - + error = execute_command(cmd, self.logger) + if error: + return error if self.logger: self.logger.info("The deployment of {0} is ended".format(dep_name)) @@ -196,11 +199,16 @@ def execute_command(cmd, logger): if result != "" and logger: logger.debug(result) if p == 0: - return True + return False else: if logger: logger.error("Error when executing command %s" % cmd) - exit(-1) + f = open(output_file, 'r') + lines = f.readlines() + result = lines[len(lines) - 3] + result += lines[len(lines) - 2] + result += lines[len(lines) - 1] + return result def download_blueprints(blueprint_url, branch, dest_path): |