+ 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-20141107225359-mdyybsncws803zfx date: 2014-11-07 15:53:59 -0700 build-date: 2015-02-09 19:21:15 +0000 revno: 649 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 649 committer: Ben Howard branch nick: master timestamp: Fri 2014-11-07 15:53:59 -0700 message: Daily cleanup enablement diff: === modified file 'README.new-release' --- README.new-release 2013-10-21 23:37:31 +0000 +++ README.new-release 2014-11-07 22:53:59 +0000 @@ -1,3 +1,5 @@ +- Ubuntu 15.04 enablement + - Ubuntu 14.04 LTS (Trust Tahr) enablement - Ubuntu 13.10 (Saucy Salamander) enablement === modified file 'daily-build-cleaner-schedule.txt' --- daily-build-cleaner-schedule.txt 2014-08-22 22:37:54 +0000 +++ daily-build-cleaner-schedule.txt 2014-11-07 22:53:59 +0000 @@ -40,6 +40,14 @@ 5 30 all ^099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-utopic-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing/hvm-instance/ubuntu-utopic-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-vivid-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/ebs-io1/ubuntu-vivid-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/ebs-ssd/ubuntu-vivid-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-vivid-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/hvm-io1/ubuntu-vivid-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-vivid-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/hvm-instance/ubuntu-vivid-daily-%{a}-server + # test images 5 30 all ^099720109477/ubuntu/images-testing-dev/ubuntu-precise-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing-dev/ebs-ssd/ubuntu-precise-daily-%{a}-server @@ -96,3 +104,13 @@ 5 30 all ^099720109477/ubuntu/images-proposed/hvm-ssd/ubuntu-utopic-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-proposed/hvm-instance/ubuntu-utopic-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-proposed/ubuntu-vivid-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-proposed/ebs/ubuntu-vivid-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-proposed/ebs-io1/ubuntu-vivid-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-proposed/ebs-ssd/ubuntu-vivid-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-proposed/hvm/ubuntu-vivid-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-proposed/hvm-io1/ubuntu-vivid-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-proposed/hvm-ssd/ubuntu-vivid-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-proposed/hvm-instance/ubuntu-vivid-daily-%{a}-server + + === modified file 'remove-old-dailies' --- remove-old-dailies 2014-06-17 22:42:04 +0000 +++ remove-old-dailies 2014-11-07 22:53:59 +0000 @@ -7,7 +7,7 @@ SAFE_FILE=.save BASES=( /srv/ec2-images/server ) -RELS="lucid precise raring saucy trusty utopic" +RELS="lucid precise trusty utopic vivid" # keep ${SAVE_COUNT} builds or builds to ${SAVE_DAYS} days ago, whichever is greater. export LANG=C + 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-20150128184707-k7dyj8s1zrjlllys date: 2015-01-28 11:47:07 -0700 build-date: 2015-02-09 19:21:16 +0000 revno: 611 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 611 committer: Ben Howard branch nick: master timestamp: Wed 2015-01-28 11:47:07 -0700 message: Update dynamic EBS publisher selection to support CN and GovCloud. diff: === modified file 'publish-build-ebs' --- publish-build-ebs 2014-12-12 00:23:10 +0000 +++ publish-build-ebs 2015-01-28 18:47:07 +0000 @@ -22,11 +22,14 @@ PUBLISH_BUCKET=${PUBLISH_BUCKET:-"ubuntu-data"} AMI_REGIONS=( $(ec2-list-all-regions) ) -# These are Ubuntu 14.04, serials of 20140927 instance store HVM's -current_amis_url="http://cloud-images.ubuntu.com/query/trusty/server/released.current.txt" +# Get an updated list of AMI's current_out=$(mktemp) -wget -O ${current_out} ${current_amis_url} || - fail "failed to get current image list" +for q in query query.cn query.govcloud +do + amis_url="http://cloud-images.ubuntu.com/$q/trusty/server/released.current.txt" + debug 1 "Fetching ${amis_url}" + curl ${amis_url} >> ${current_out} +done DEF_AMI_IDS=() for region in ${AMI_REGIONS[@]}; @@ -34,7 +37,7 @@ match=$(awk '-F\t' '$7==region && $5==disk && $6==arch && $NF==btype {print$8}' \ 'OFS=\t' "region=${region}" arch="amd64" btype="hvm" disk="instance-store" ${current_out} ) - [ -z "${match}" ] && fail "failed to find AMI for ${region}" + [ -z "${match}" -a -z "${EBS_UTIL_AMIS}" ] && fail "failed to find AMI for ${region}" debug 1 "Using AMI ${match} for ${region}" DEF_AMI_IDS+=(${match}) done + 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-02-09 19:21:16 +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-02-09 19:21:17 +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 ''