Commit 12009b01 by Feanil Patel

Print all hipchat messages to jenkins as well.

Also use the proper return code when abbey has issues.
parent 965e7c25
...@@ -647,6 +647,7 @@ def launch_and_configure(ec2_args): ...@@ -647,6 +647,7 @@ def launch_and_configure(ec2_args):
def send_hipchat_message(message): def send_hipchat_message(message):
print(message)
#If hipchat is configured send the details to the specified room #If hipchat is configured send the details to the specified room
if args.hipchat_api_token and args.hipchat_room_id: if args.hipchat_api_token and args.hipchat_room_id:
import hipchat import hipchat
...@@ -710,6 +711,7 @@ if __name__ == '__main__': ...@@ -710,6 +711,7 @@ if __name__ == '__main__':
else: else:
base_ami = args.base_ami base_ami = args.base_ami
error_in_abbey_run = False
try: try:
sqs_queue = None sqs_queue = None
instance_id = None instance_id = None
...@@ -749,6 +751,7 @@ if __name__ == '__main__': ...@@ -749,6 +751,7 @@ if __name__ == '__main__':
play=args.play, play=args.play,
exception=repr(e)) exception=repr(e))
send_hipchat_message(message) send_hipchat_message(message)
error_in_abbey_run = True
finally: finally:
print print
if not args.no_cleanup and not args.noop: if not args.no_cleanup and not args.noop:
...@@ -761,3 +764,5 @@ if __name__ == '__main__': ...@@ -761,3 +764,5 @@ if __name__ == '__main__':
# Check to make sure we have an instance id. # Check to make sure we have an instance id.
if instance_id: if instance_id:
ec2.terminate_instances(instance_ids=[instance_id]) ec2.terminate_instances(instance_ids=[instance_id])
if error_in_abbey_run:
exit(1)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment