You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/08/01 09:06:29 UTC
git commit: updated refs/heads/master to 880f186
Repository: cloudstack
Updated Branches:
refs/heads/master f7c664fc2 -> 880f186ed
Improve exitcodes so jenkins can deal with it
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/880f186e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/880f186e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/880f186e
Branch: refs/heads/master
Commit: 880f186edeef43be4d705b905b8f5fcb2325d1d5
Parents: f7c664f
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Aug 1 08:53:50 2014 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Fri Aug 1 09:06:13 2014 +0200
----------------------------------------------------------------------
tools/marvin/marvin/deployDataCenter.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/880f186e/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index ae48839..ce2e5b7 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -1118,8 +1118,11 @@ if __name__ == "__main__":
cfg,
tc_run_logger,
log_folder_path=log_folder_path)
- deploy.deploy()
- exit(1)
+ if deploy.deploy() == FAILED
+ print "\n===Deploy Failed==="
+ tc_run_logger.debug("\n===Deploy Failed===");
+ exit(1)
+
if options.remove and os.path.isfile(options.remove) and options.input:
'''
@@ -1133,7 +1136,10 @@ if __name__ == "__main__":
if remove_dc_obj.removeDataCenter() == FAILED:
print "\n===Removing DataCenter Failed==="
tc_run_logger.debug("\n===Removing DataCenter Failed===")
+ exit(1)
else:
print "\n===Removing DataCenter Successful==="
tc_run_logger.debug("\n===Removing DataCenter Successful===")
- exit(1)
+
+ # All OK exit with 0 exitcode
+ exit(0)