removing old buckets when creating new amis on s3, linked up product id

git-svn-id: http://svn.opengeo.org/suite/trunk@2350 fe66add1-021f-4af3-b75b-ea5154e73f91

Author: jdeolive

aws/build_ubuntu_ami.sh

@@ -72,7 +72,7 @@ function poll_image() {
 }
 
 if [ -z $3 ]; then
-  echo "Usage: $0 AMI_ID IMAGE_NAME <dev|prod> [-t 'ebs'|'s3'] [ -a 'i386'|'x86_64'] [ -s 'm1.small'|'m1.large'] [--skip-create-image]"
+  echo "Usage: $0 AMI_ID IMAGE_NAME <dev|prod> [-t 'ebs'|'s3'] [ -a 'i386'|'x86_64'] [ -s 'm1.small'|'m1.large'] [ -p <product_id> ] [--skip-create-image]"
   exit 1
 fi
 
@@ -93,6 +93,9 @@ for (( i = 2; i < ${#args[*]}; i++ )); do
   if [ $arg == "-s" ]; then
     IMAGE_SIZE=$val
   fi
+  if [ $arg == "-p" ]; then
+    PRODUCT_ID=$val
+  fi
   if [ $arg == "--skip-create-image" ]; then
     SKIP_CREATE_IMAGE="yes"
   fi
@@ -156,11 +159,24 @@ if [ -z $SKIP_CREATE_IMAGE ]; then
 
     scp $SSH_OPTS s3-$ACCOUNT.properties ubuntu@$HOST:/home/ubuntu/s3.properties
     check_rc $? "upload s3 properties"
+
+    scp $SSH_OPTS s3cfg-$ACCOUNT ubuntu@$HOST:/home/ubuntu/s3cfg
+    check_rc $? "upload s3cfg-$ACCOUNT"
 
     ssh $SSH_OPTS ubuntu@$HOST "cd /home/ubuntu && ./bundle_s3_image.sh $IMAGE_NAME $IMAGE_ARCH"
     check_rc $? "remote bundle image"
   fi
 fi
 
+if [ ! -z $PRODUCT_ID ]; then
+  # link the image to the product id
+  ec2-modify-image-attribute $IMAGE_ID -p $PRODUCT_ID
+  check_rc $? "linking image $IMAGE_ID to product $PRODUCT_ID"
+
+  # make the image public
+  ec2-modify-image-attribute $IMAGE_ID -l -a all 
+  check_rc $? "making image $IMAGE_ID public"
+fi
+
 # shut down the instance
 ec2-terminate-instances $INSTANCE_ID

aws/bundle_s3_image.sh

@@ -25,11 +25,11 @@ IMAGE_ARCH=$2
 export EC2_PRIVATE_KEY=`ls ~/pk-*`
 export EC2_CERT=`ls ~/cert-*`
 
-# install the ec2-api/ami-tools 
+# install the ec2-api/ami-tools and s3cmd
 sudo bash -c "echo 'deb http://us.archive.ubuntu.com/ubuntu/ lucid multiverse' >> /etc/apt/sources.list"
 sudo apt-get update
-sudo apt-get -y install ec2-api-tools ec2-ami-tools
-check_rc $? "apt-get install ec2 api/ami tools"
+sudo apt-get -y install ec2-api-tools ec2-ami-tools s3cmd
+check_rc $? "apt-get install ec2 api/ami + s3cmd tools"
 
 if [ -z $SKIP_BUNDLE ]; then
   # bundle the image
@@ -44,6 +44,16 @@ if [ ! -e  $IMAGE_MANIFEST ]; then
 fi
 
 S3_BUCKET=$S3_BUCKET_ROOT/$IMAGE_NAME
+S3CMD_CONFIG=~/s3cfg
+
+s3cmd -c $S3CMD_CONFIG ls s3://$S3_BUCKET_ROOT 
+check_rc $? "listing contents of $S3_BUCKET_ROOT"
+
+# figure out if the directory already exists, and delete it if necessary
+s3cmd -c $S3CMD_CONFIG ls s3://$S3_BUCKET_ROOT | grep $IMAGE_NAME
+if [ $? -eq 0 ]; then
+  s3cmd -c $S3CMD_CONFIG -r del s3://$S3_BUCKET
+fi
 
 if [ -z $SKIP_UPLOAD ]; then
   # upload the bundle

aws/hudson_build.sh

@@ -1,14 +1,19 @@
 #!/bin/bash
 
 if [ -z $4 ]; then
-  echo "Usage: $0 AMI_ID <i386|x86_64> <ebs|s3> <dev|prod>"
+  echo "Usage: $0 AMI_ID <i386|x86_64> <ebs|s3> <dev|prod> [-p <product_id>]"
   exit 1
 fi
 
 AMI_ID=$1
 IMAGE_ARCH=$2
 IMAGE_TYPE=$3
 ACCOUNT=$4
+
+if [ $5 == "-p" ]; then
+  PRODUCT_ID=$6
+fi
+
 IMAGE_SIZE="m1.small"
 if [ $IMAGE_ARCH == "x86_64" ]; then
   IMAGE_SIZE="m1.large"
@@ -24,4 +29,4 @@ popd > /dev/null
 ver=`get_ami_version $REPO_PATH`
 
 # build it
-./build_ubuntu_ami.sh $AMI_ID suite-$ver-$IMAGE_ARCH-`date +"%Y%m%d"` $ACCOUNT -t $IMAGE_TYPE -s $IMAGE_SIZE -a $IMAGE_ARCH
+./build_ubuntu_ami.sh $AMI_ID suite-$ver-$IMAGE_ARCH-`date +"%Y%m%d"` $ACCOUNT -t $IMAGE_TYPE -s $IMAGE_SIZE -a $IMAGE_ARCH -p $PRODUCT_ID

aws/s3cfg-dev

@@ -0,0 +1,38 @@
+[default]
+access_key = AKIAIEIFXZRDU4AY5B3Q
+bucket_location = US
+cloudfront_host = cloudfront.amazonaws.com
+cloudfront_resource = /2010-07-15/distribution
+default_mime_type = binary/octet-stream
+delete_removed = False
+dry_run = False
+encoding = UTF-8
+encrypt = False
+follow_symlinks = False
+force = False
+get_continue = False
+gpg_command = None
+gpg_decrypt = %(gpg_command)s -d --verbose --no-use-agent --batch --yes --passphrase-fd %(passphrase_fd)s -o %(output_file)s %(input_file)s
+gpg_encrypt = %(gpg_command)s -c --verbose --no-use-agent --batch --yes --passphrase-fd %(passphrase_fd)s -o %(output_file)s %(input_file)s
+gpg_passphrase = 
+guess_mime_type = True
+host_base = s3.amazonaws.com
+host_bucket = %(bucket)s.s3.amazonaws.com
+human_readable_sizes = False
+list_md5 = False
+log_target_prefix = 
+preserve_attrs = True
+progress_meter = True
+proxy_host = 
+proxy_port = 0
+recursive = False
+recv_chunk = 4096
+reduced_redundancy = False
+secret_key = LbEM4l6xxqHiJUY6Kb6eHyvl3Ryn3ItefAz02mnd
+send_chunk = 4096
+simpledb_host = sdb.amazonaws.com
+skip_existing = False
+socket_timeout = 10
+urlencoding_mode = normal
+use_https = False
+verbosity = WARNING

aws/s3cfg-prod

@@ -0,0 +1,38 @@
+[default]
+access_key = AKIAI7SFU3MT3R5WKHSA
+bucket_location = US
+cloudfront_host = cloudfront.amazonaws.com
+cloudfront_resource = /2010-07-15/distribution
+default_mime_type = binary/octet-stream
+delete_removed = False
+dry_run = False
+encoding = UTF-8
+encrypt = False
+follow_symlinks = False
+force = False
+get_continue = False
+gpg_command = None
+gpg_decrypt = %(gpg_command)s -d --verbose --no-use-agent --batch --yes --passphrase-fd %(passphrase_fd)s -o %(output_file)s %(input_file)s
+gpg_encrypt = %(gpg_command)s -c --verbose --no-use-agent --batch --yes --passphrase-fd %(passphrase_fd)s -o %(output_file)s %(input_file)s
+gpg_passphrase = 
+guess_mime_type = True
+host_base = s3.amazonaws.com
+host_bucket = %(bucket)s.s3.amazonaws.com
+human_readable_sizes = False
+list_md5 = False
+log_target_prefix = 
+preserve_attrs = True
+progress_meter = True
+proxy_host = 
+proxy_port = 0
+recursive = False
+recv_chunk = 4096
+reduced_redundancy = False
+secret_key = aKbeL+akiq069+k8FFScdKXTogTwb8ZnXjD4yObq
+send_chunk = 4096
+simpledb_host = sdb.amazonaws.com
+skip_existing = False
+socket_timeout = 10
+urlencoding_mode = normal
+use_https = False
+verbosity = WARNING