+ echo '====== automated-ec2-builds [/tmp/automated-ec2-builds] ======'
====== automated-ec2-builds [/tmp/automated-ec2-builds] ======
+ cd /tmp/automated-ec2-builds
+ bzr info
Standalone tree (format: 2a)
Location:
  branch root: .

Related branches:
  parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/vmbuilder/automated-ec2-builds/
+ bzr version-info
revision-id: ben.howard@ubuntu.com-20160105005557-fsgq9c7fdu86a2ep
date: 2016-01-04 17:55:57 -0700
build-date: 2016-02-03 07:45:55 +0000
revno: 717
branch-nick: automated-ec2-builds
+ bzr log -p -r-1
------------------------------------------------------------
revno: 717
committer: Ben Howard <ben.howard@ubuntu.com>
branch nick: master
timestamp: Mon 2016-01-04 17:55:57 -0700
message:
  Revert prior commit, and build Wily using Updates. Per the Launchpad team, we are invocking buildds wrong; we should be using the Updates pocket.
diff:
=== modified file 'build-buildd-image'
--- build-buildd-image	2016-01-05 00:19:49 +0000
+++ build-buildd-image	2016-01-05 00:55:57 +0000
@@ -139,6 +139,11 @@
             --cred-location /.lp_creds
         )
 
+    # Only use the PPA for versions before wily
+    if dist_le "${suite}" vivid; then
+        cmd+=(--archive ppa:cloud-images-release-managers/cloud-image-tooling)
+    fi
+
     # Xenial builds are failing due to disk types
     if dist_ge "${suite}" xenial; then
         cmd+=(--archive ppa:cloud-images-release-managers/cloud-image-tooling)

=== modified file 'livefs-build.py'
--- livefs-build.py	2015-03-18 10:25:36 +0000
+++ livefs-build.py	2016-01-05 00:55:57 +0000
@@ -58,7 +58,7 @@
     lfs = _get_livefs(lp, livefs_name, suite, image_format, project)
     metadata = {'image_format': image_format, 'project': project}
     build = lfs.requestBuild(
-        pocket='Release' if not proposed else 'Proposed',
+        pocket='Updates' if not proposed else 'Proposed',
         archive=archive,
         distro_arch_series='/ubuntu/{}/{}'.format(suite, arch),
         metadata_override=metadata)
+ echo ''

+ echo '====== ec2-publishing-scripts [/tmp/ec2-publishing-scripts] ======'
====== ec2-publishing-scripts [/tmp/ec2-publishing-scripts] ======
+ cd /tmp/ec2-publishing-scripts
+ bzr info
Standalone tree (format: unnamed)
Location:
  branch root: .

Related branches:
  parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/ubuntu-on-ec2/ec2-publishing-scripts/
+ bzr version-info
revision-id: ben.howard@ubuntu.com-20160202002802-grb6b4o38mtvo63j
date: 2016-02-01 17:28:02 -0700
build-date: 2016-02-03 07:45:55 +0000
revno: 625
branch-nick: ec2-publishing-scripts
+ bzr log -p -r-1
------------------------------------------------------------
revno: 625
committer: Ben Howard <ben.howard@ubuntu.com>
branch nick: master
timestamp: Mon 2016-02-01 17:28:02 -0700
message:
  Add retry wrapper around permissions due to service api failures
diff:
=== modified file 'modify-access'
--- modify-access	2014-10-22 21:49:40 +0000
+++ modify-access	2016-02-02 00:28:02 +0000
@@ -22,6 +22,27 @@
 		END { exit(e); }' "id=${1}" e=1 "${2}"
 }
 
+# retry(max,sleeptime, cmd)
+# retry cmd up to max times until it suceeds, sleeping sleeptime in between
+retry() {
+    local max=$1 sleep=$2 i=0 ret=0;
+    shift 2 || { debug 1 "bad input to retry"; return 1; }
+    while :; do
+        i=$(($i+1))
+        "$@" ; ret=$?
+        [ $ret -eq 0 ] && break
+        [ $i -eq 1 ] && debug 1 "cmd failed [$i/$max]: $*" ||
+            debug 2 "cmd failed [$i/$max]: $*"
+        [ $i -lt $max ] || break
+        sleep "$sleep"
+    done
+    if [ $ret -eq 0 ]; then
+        [ $i -ne 1 ] && debug 1 "cmd passed [$i/$max]: $*"
+        return 0
+    fi
+    return $ret
+}
+
 Usage() {
 	cat <<EOF
 Usage: ${0##*/} [ options ] publish-info.txt [ publish-info.txt [ ... ] ]
@@ -148,7 +169,7 @@
 		while read region id arch img_type path; do
 			[ "${region#\#}" = "${region}" ] || continue # skip comment lines
 			printf "%s %s\n" "${region}" "${id}${path:+ ${path}}"
-			${dry_echo} xc2 modify-image-attribute --region "${region}" \
+			${dry_echo} retry 3 5 xc2 modify-image-attribute --region "${region}" \
 				--launch-permission "${modargs[@]}" "${id}" ||
 				fail "failed to set perms for ${region}/${id}: ${modargs[*]}"
 
@@ -156,7 +177,7 @@
 				awk '$1 == "BLOCKDEVICEMAPPING" && $3 == "/dev/sda1" { print $4 }')
 			[ -z "${snap}" ] || {
 				printf "%s %s %s\n" "${region}" "${snap}" "${id}${path:+ ${path}}"
-				${dry_echo} xc2 modify-snapshot-attribute --region "${region}" \
+				${dry_echo} retry 3 5 xc2 modify-snapshot-attribute --region "${region}" \
 					--create-volume-permission "${modargs[@]}" "${snap}" ||
 					fail "failed to set snapshot perms for (${snap}): ${region}/${id}: ${modargs[*]}";
 			}
+ echo ''

+ echo '====== live-build [/tmp/live-build] ======'
====== live-build [/tmp/live-build] ======
+ cd /tmp/live-build
+ bzr info
Standalone tree (format: 1.9-rich-root)
Location:
  branch root: .

Related branches:
  parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/live-build/cloud-images/
+ bzr version-info
revision-id: ben.howard@canonical.com-20150612123735-zf4q8vxmjb7vaq7w
date: 2015-06-12 06:37:35 -0600
build-date: 2016-02-03 07:45:56 +0000
revno: 1884
branch-nick: live-build
+ bzr log -p -r-1
------------------------------------------------------------
revno: 1884
committer: Ben Howard <ben.howard@canonical.com>
branch nick: live-build
timestamp: Fri 2015-06-12 06:37:35 -0600
message:
  Drop kernel from ubuntu-cloud-t-hwe package list; use live build cli to configure
diff:
=== modified file 'package-lists/ubuntu-cloud-t-hwe'
--- package-lists/ubuntu-cloud-t-hwe	2015-06-11 22:55:21 +0000
+++ package-lists/ubuntu-cloud-t-hwe	2015-06-12 12:37:35 +0000
@@ -6,4 +6,4 @@
 standard^ cloud-image^
 
 # Packages
-linux-image-virtual-lts-vivid landscape-client ubuntu-minimal
+landscape-client ubuntu-minimal
+ echo ''

+ echo '====== vmbuilder-0.11 [/tmp/vmbuilder-0.11] ======'
====== vmbuilder-0.11 [/tmp/vmbuilder-0.11] ======
+ cd /tmp/vmbuilder-0.11
+ bzr info
Standalone tree (format: 2a)
Location:
  branch root: .

Related branches:
  parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/vmbuilder/0.11a/
+ bzr version-info
revision-id: ben.howard@canonical.com-20120605221454-crv9cc4612f907lh
date: 2012-06-05 16:14:54 -0600
build-date: 2016-02-03 07:45:56 +0000
revno: 398
branch-nick: vmbuilder-0.11
+ bzr log -p -r-1
------------------------------------------------------------
revno: 398
committer: Ben Howard <ben.howard@canonical.com>
branch nick: vmbuilder
timestamp: Tue 2012-06-05 16:14:54 -0600
message:
  Fix for allow vmbuilder to run on 12.04 LTS.
diff:
=== modified file 'VMBuilder/plugins/ubuntu/dapper.py'
--- VMBuilder/plugins/ubuntu/dapper.py	2011-05-18 20:49:25 +0000
+++ VMBuilder/plugins/ubuntu/dapper.py	2012-06-05 22:14:54 +0000
@@ -157,18 +157,15 @@
             self.vm.addpkg += ['openssh-server']
 
     def mount_dev_proc(self):
-        run_cmd('mount', '--bind', '/dev', '%s/dev' % self.destdir)
-        self.vm.add_clean_cmd('umount', '%s/dev' % self.destdir, ignore_fail=True)
-
-        run_cmd('mount', '--bind', '/dev/pts', '%s/dev/pts' % self.destdir)
+        run_cmd('mkdir', '-p', '%s/dev/pts' % self.destdir)
+        run_cmd('mount', '-t', 'devpts',  'devpts-live', '%s/dev/pts' % self.destdir)
         self.vm.add_clean_cmd('umount', '%s/dev/pts' % self.destdir, ignore_fail=True)
 
-        self.run_in_target('mount', '-t', 'proc', 'proc', '/proc')
+        run_cmd('mount', '-t', 'proc', 'proc-live', '%s/proc' % self.destdir)
         self.vm.add_clean_cmd('umount', '%s/proc' % self.destdir, ignore_fail=True)
 
     def unmount_dev_proc(self):
         run_cmd('umount', '%s/dev/pts' % self.destdir)
-        run_cmd('umount', '%s/dev' % self.destdir)
         run_cmd('sh', '-c', 'grep -q "$1" /proc/mounts || exit 0; umount "$1"',
                 'umount_binfmt', "%s/proc/sys/fs/binfmt_misc" % self.destdir)
         run_cmd('umount', '%s/proc' % self.destdir)
+ echo ''