+ 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: daniel.watkins@canonical.com-20171208174822-6pwdvdizm0undkff date: 2017-12-08 12:48:22 -0500 build-date: 2018-01-22 23:26:37 +0000 revno: 734 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 734 [merge] committer: Daniel Watkins branch nick: automated-ec2-builds timestamp: Fri 2017-12-08 12:48:22 -0500 message: Remove /var/lib/dbus/machine-id from all images [a=Odd_Bloke][r=fginther,philroche] MP: https://code.launchpad.net/~daniel-thewatkins/vmbuilder/automated-ec2-builds/+merge/334980 diff: === added file 'live-config/common/hooks/070-clear-machine-id.chroot' --- live-config/common/hooks/070-clear-machine-id.chroot 1970-01-01 00:00:00 +0000 +++ live-config/common/hooks/070-clear-machine-id.chroot 2017-12-08 15:46:34 +0000 @@ -0,0 +1,7 @@ +#!/bin/sh -eux + +# machine-id should be generated on first boot of each instance, so we clear it +# out here. See https://bugs.launchpad.net/cloud-images/+bug/1731279 for more +# info. + +rm /var/lib/dbus/machine-id ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions. + 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-20171211144733-o5stqjc3tu0h3gak date: 2017-12-11 09:47:33 -0500 build-date: 2018-01-22 23:26:37 +0000 revno: 658 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 658 [merge] committer: Daniel Watkins branch nick: ec2-publishing-scripts timestamp: Mon 2017-12-11 09:47:33 -0500 message: Make AWS profile/partition used by CIM configurable [a=Odd_Bloke][r=fginther,rcj] MP: https://code.launchpad.net/~daniel-thewatkins/ubuntu-on-ec2/ec2-publishing-scripts/+merge/334987 diff: === modified file 'ec2-image2ebs' --- ec2-image2ebs 2017-08-16 13:42:44 +0000 +++ ec2-image2ebs 2017-12-08 19:44:46 +0000 @@ -650,11 +650,13 @@ fi debug 1 "Running cloud-image-manager register_image_from_snapshot ..." + set -x ${VENV_BIN}/cloud-image-manager \ --debug-log debug.log \ --log-to-console \ aws \ - --profile alan \ + --partition "${AWS_DEFAULT_PARTITION:-aws}" \ + --profile "${AWS_DEFAULT_PROFILE:-alan}" \ register_image_from_snapshot \ "${SUITE}" \ "${SERIAL}" \ @@ -667,6 +669,7 @@ --query-data-directory=${query_data_directory} \ --force-querydata \ --no-debug + set +x # read the img_id from the generated query data read junk junk junk junk junk junk junk new_ami junk < ${query_data_file} === modified file 'publish-hvm-image' --- publish-hvm-image 2017-08-16 13:42:44 +0000 +++ publish-hvm-image 2017-12-08 17:30:52 +0000 @@ -438,11 +438,13 @@ # attributes during registration that can not be set using the old way # to register images. echo "Running cloud-image-manager register_image ..." + set -x ${VENV_BIN}/cloud-image-manager \ --debug-log debug.log \ --log-to-console \ aws \ - --profile alan \ + --partition "${AWS_DEFAULT_PARTITION:-aws}" \ + --profile "${AWS_DEFAULT_PROFILE:-alan}" \ register_image \ "${SUITE}" \ "${SERIAL}" \ @@ -454,6 +456,7 @@ --restrict_to_region ${region} \ --query-data-directory=${query_data_directory} \ --force-querydata + set +x echo "cloud-image-manager register_image query data output ..." ls -al ${query_data_directory} ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions. + 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: 2018-01-22 23:26:38 +0000 revno: 1884 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1884 committer: Ben Howard 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: 2018-01-22 23:26:38 +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 ''