+ 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-20150323190005-w8fziqj08dgjetgp
date: 2015-03-23 13:00:05 -0600
build-date: 2015-03-25 13:14:06 +0000
revno: 660
branch-nick: automated-ec2-builds
+ bzr log -p -r-1
------------------------------------------------------------
revno: 660
committer: Ben Howard <ben.howard@ubuntu.com>
branch nick: master
timestamp: Mon 2015-03-23 13:00:05 -0600
message:
  Fixed up ubuntu-ver2adj
diff:
=== modified file 'ubuntu-ver2adj'
--- ubuntu-ver2adj	2015-03-23 18:43:49 +0000
+++ ubuntu-ver2adj	2015-03-23 19:00:05 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 map_c_to_v() {
-    c=$(ubuntu-distro-info --series=${1} -r)
+    c=$(ubuntu-distro-info --series=${1// LTS/} -r)
     if [[ "${c}" =~ "unknwon" ]]; then
         echo "unknown"
     else
+ 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: smoser@ubuntu.com-20150313164340-virmi9kr1r8w3778
date: 2015-03-13 12:43:40 -0400
build-date: 2015-03-25 13:14:06 +0000
revno: 613
branch-nick: ec2-publishing-scripts
+ bzr log -p -r-1
------------------------------------------------------------
revno: 613
committer: Scott Moser <smoser@ubuntu.com>
branch nick: ec2-publishing-scripts
timestamp: Fri 2015-03-13 12:43:40 -0400
message:
  publicize-build: do not use cache of 'xc2 ximages'
  
  The commits in revno 549 to 556 basically add loop that tries a
  describe-images, checks that it has the images desired, and sleeps if it
  is not present.
  
  The problem is that it is using 'xc2 ximages' which utilizes a cache to
  avoid the expensive list (see revno 367).  So sleeping and trying again is
  nothing but a waste of time.
  
  I'm not sure why the cache would not have these images that were being
  looked for.  That is definitely concerning, but reading the same cached
  data back again is not going to produce it.
  
  My only theory is that this tool is inheriting a cache that has
  been corrupted somehow.  the 'xc2 images register' is definitely not
  suitable for concurrent access to it, so that is possible.  However
  if that were the case, then 'modify-access' would also have inherited
  such a cache, but it finds its images.
    see failed log here: http://paste.ubuntu.com/10591749/
  
  This change here should make the try-and-sleep code actually do something and
  in the correct case wont make additional calls to the heavy describe-images
  anyway.
diff:
=== modified file 'publicize-build'
--- publicize-build	2014-06-16 16:44:43 +0000
+++ publicize-build	2015-03-13 16:43:40 +0000
@@ -307,8 +307,6 @@
 TEMP_D=$(mktemp -d "${TMPDIR:-/tmp}/${0##*/}.XXXXXX")
 trap cleanup EXIT
 
-export XC2_XIMAGES_CACHE_D=${XC2_XIMAGES_CACHE_D:-"$TEMP_D/ximgcache"}
-
 # create a set of region.<region>.list files so we can
 # run a single describe-images per region
 while read region ami arch img_type manifest rest; do
@@ -326,7 +324,7 @@
     debug 0 "Querying region ${region} image AMIs: ${amis}"
     try=5
     while (( ${try} > 0 )) ; do
-    	xc2 ximages describe-images --region "${region}" $amis > "${imgf}" ||
+    	xc2 describe-images --region "${region}" $amis > "${imgf}" ||
     		fail "failed to describe in ${region}: ${amis}"
         found_all=1
         for AMI in ${amis}; do
+ 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-20141208180246-js9ir7isckza6dli
date: 2014-12-08 11:02:46 -0700
build-date: 2015-03-25 13:14:06 +0000
revno: 1881
branch-nick: live-build
+ bzr log -p -r-1
------------------------------------------------------------
revno: 1881
committer: Ben Howard <ben.howard@canonical.com>
branch nick: live-build
timestamp: Mon 2014-12-08 11:02:46 -0700
message:
  Allow for 2TB resizes
diff:
=== modified file 'scripts/build/lb_binary_virtual-hdd-raw'
--- scripts/build/lb_binary_virtual-hdd-raw	2014-02-25 20:46:27 +0000
+++ scripts/build/lb_binary_virtual-hdd-raw	2014-12-08 18:02:46 +0000
@@ -81,7 +81,7 @@
 		ext2|ext3|ext4)
 			Echo_message "Creating virtual disk image..."
 			Chroot chroot "dd if=/dev/zero of=binary-raw.img bs=1024k count=0 seek=${LB_HDD_SIZE}"
-			Chroot chroot "mkfs.${LB_BINARY_FILESYSTEM} -F /binary-raw.img -L ${LB_HDD_FILESYSTEM_LABEL} -U ${FS_UUID}"
+			Chroot chroot "mkfs.${LB_BINARY_FILESYSTEM} -F /binary-raw.img -L ${LB_HDD_FILESYSTEM_LABEL} -U ${FS_UUID} -E resize=536870912"
 			;;
 	esac
 
@@ -97,7 +97,7 @@
 		ext2|ext3|ext4)
 			Echo_message "Creating virtual filesystem...(created outside chroot)"
 			dd if=/dev/zero of=binary-raw.img bs=1024k count=0 seek=${LB_HDD_SIZE}
-			${LB_ROOT_COMMAND} mkfs.${LB_BINARY_FILESYSTEM} -F binary-raw.img -L ${LB_HDD_FILESYSTEM_LABEL} -U ${FS_UUID}
+			${LB_ROOT_COMMAND} mkfs.${LB_BINARY_FILESYSTEM} -F binary-raw.img -L ${LB_HDD_FILESYSTEM_LABEL} -U ${FS_UUID} -E resize=536870912
 			${LB_ROOT_COMMAND} mount -o loop binary-raw.img binary-raw.tmp
 			rsync -aXHAS \
                  --one-file-system \
+ 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: 2015-03-25 13:14:07 +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 ''