Merge pull request #1235 from edx/feanil/abbey_profiles

Feanil/abbey profiles

playbooks/roles/aws/defaults/main.yml

@@ -56,7 +56,7 @@ aws_debian_pkgs:
 aws_pip_pkgs:
   - https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz
   - awscli
-  - boto==2.20.1
+  - boto==2.29.1
 
 aws_redhat_pkgs: []
 aws_s3cmd_version: s3cmd-1.5.0-beta1

requirements.txt

@@ -3,7 +3,7 @@ PyYAML==3.11
 Jinja2==2.7.2
 MarkupSafe==0.23
 argparse==1.2.1
-boto==2.28.0
+boto==2.29.1
 ecdsa==0.11
 paramiko==1.14.0
 pycrypto==2.6.1

util/jenkins/build-ami.sh

@@ -61,17 +61,9 @@ fi
 
 export PYTHONUNBUFFERED=1
 
-if [[ -z $configuration ]]; then
-  cd configuration
-  configuration=`git rev-parse HEAD`
-  cd ..
-fi
-
-if [[ -z $configuration_secure ]]; then
-  cd configuration-secure
-  configuration_secure=`git rev-parse HEAD`
-  cd ..
-fi
+cd $WORKSPACE/configuration
+configuration=`git rev-parse --short HEAD`
+cd $WORKSPACE
 
 base_params=""
 if [[ -n "$base_ami" ]]; then
@@ -96,11 +88,6 @@ if [[ ! -z "$configurationprivaterepo" ]]; then
   fi
 fi
 
-stackname_params=""
-if [[ ! -z "$playbook_dir" ]]; then
-  stackname_params="--playbook-dir $playbook_dir"
-fi
-
 hipchat_params=""
 if [[ ! -z "$hipchat_room_id" ]] && [[ ! -z "$hipchat_api_token"  ]]; then
   hipchat_params="--hipchat-room-id $hipchat_room_id --hipchat-api-token $hipchat_api_token"

util/vpc-tools/abbey.py

@@ -647,6 +647,7 @@ def launch_and_configure(ec2_args):
 
 
 def send_hipchat_message(message):
+    print(message)
     #If hipchat is configured send the details to the specified room
     if args.hipchat_api_token and args.hipchat_room_id:
         import hipchat
@@ -710,6 +711,7 @@ if __name__ == '__main__':
     else:
         base_ami = args.base_ami
 
+    error_in_abbey_run = False
     try:
         sqs_queue = None
         instance_id = None
@@ -749,6 +751,7 @@ if __name__ == '__main__':
                 play=args.play,
                 exception=repr(e))
         send_hipchat_message(message)
+        error_in_abbey_run = True
     finally:
         print
         if not args.no_cleanup and not args.noop:
@@ -761,3 +764,5 @@ if __name__ == '__main__':
             # Check to make sure we have an instance id.
             if instance_id:
                 ec2.terminate_instances(instance_ids=[instance_id])
+        if error_in_abbey_run:
+            exit(1)