+ 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-20150512152501-63vtsk0fo8yb2x7h date: 2015-05-12 09:25:01 -0600 build-date: 2015-05-12 23:40:08 +0000 revno: 675 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 675 committer: Ben Howard branch nick: master timestamp: Tue 2015-05-12 09:25:01 -0600 message: Fixed vivid tagging on Wily diff: === modified file 'conf/wily-arm-server.conf' --- conf/wily-arm-server.conf 2015-05-08 14:41:35 +0000 +++ conf/wily-arm-server.conf 2015-05-12 15:25:01 +0000 @@ -1,4 +1,4 @@ -suite="vivid" +suite="wily" description="Ubuntu 15.04 (Vivid Vervet)" copy_out_kernels=1 unpublished_ramdisks="" === modified file 'conf/wily-arm64-server.conf' --- conf/wily-arm64-server.conf 2015-05-08 14:41:35 +0000 +++ conf/wily-arm64-server.conf 2015-05-12 15:25:01 +0000 @@ -1,4 +1,4 @@ -suite="vivid" +suite="wily" description="Ubuntu 15.04 (Vivid Vervet)" copy_out_kernels=1 unpublished_ramdisks="" === modified file 'conf/wily-desktop-server.conf' --- conf/wily-desktop-server.conf 2015-05-08 14:41:35 +0000 +++ conf/wily-desktop-server.conf 2015-05-12 15:25:01 +0000 @@ -1,4 +1,4 @@ -suite="vivid" +suite="wily" description="Ubuntu 12.10 (Vivid Vervet)" lb_conf=( sudo "LB_BASE=%L" "PATH=%x" "%P/lb_config" "--distribution=%d" "--mode=ubuntu" "--build-with-chroot=true" "--chroot-filesystem=plain" "--system=normal" "--package-list=ubuntu-cloud-desktop" "--hdd-fs-label=%l" "--hdd-new-fstab" === modified file 'conf/wily-ppc64el-server.conf' --- conf/wily-ppc64el-server.conf 2015-05-08 14:41:35 +0000 +++ conf/wily-ppc64el-server.conf 2015-05-12 15:25:01 +0000 @@ -1,4 +1,4 @@ -suite="vivid" +suite="wily" description="Ubuntu 15.04 (Vivid Vervet)" copy_out_kernels=1 + 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: daniel.watkins@canonical.com-20150416161734-c5ha2v08ufzey7ko date: 2015-04-16 17:17:34 +0100 build-date: 2015-05-12 23:40:08 +0000 revno: 621 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 621 committer: Daniel Watkins branch nick: trunk timestamp: Thu 2015-04-16 17:17:34 +0100 message: Don't unset EBS_SKIP_ARCH. diff: === modified file 'publish-build-ebs' --- publish-build-ebs 2015-04-16 10:46:00 +0000 +++ publish-build-ebs 2015-04-16 16:17:34 +0000 @@ -59,7 +59,6 @@ TERMINATE="" TMPD="" -EBS_SKIP_ARCH= ITEMS_EBS="i386:ebs amd64:ebs i386:ebs-io1 amd64:ebs-io1 i386:ebs-ssd amd64:ebs-ssd" ITEMS_HVM="amd64:hvm amd64:hvm-io1 amd64:hvm-ssd" ITEMS_EBS="${OVERRIDE_ITEMS_EBS:-$ITEMS_EBS}" + 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-05-12 23:40:08 +0000 revno: 1881 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1881 committer: Ben Howard 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-05-12 23:40:09 +0000 revno: 398 branch-nick: vmbuilder-0.11 + bzr log -p -r-1 ------------------------------------------------------------ revno: 398 committer: Ben Howard 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 ''