+ 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-02-01 21:40:24 +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: robert.jennings@canonical.com-20180124170234-pdm6obtmbtwpveih date: 2018-01-24 11:02:34 -0600 build-date: 2018-02-01 21:40:25 +0000 revno: 659 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 659 [merge] committer: Robert C Jennings branch nick: ec2-publishing-scripts timestamp: Wed 2018-01-24 11:02:34 -0600 message: Add retries for common failure paths [a=rcj][r=fginther,philroche] MP: https://code.launchpad.net/~rcj/ubuntu-on-ec2/ec2-publishing-scripts/+merge/336555 diff: === modified file 'modify-access' --- modify-access 2016-02-23 21:11:35 +0000 +++ modify-access 2018-01-24 16:38:59 +0000 @@ -1,6 +1,7 @@ #!/bin/bash # vi: ts=4 noexpandtab +VERBOSITY=0 error() { echo "$@" 1>&2; } errorp() { printf "$@" 1>&2; } fail() { [ $# -eq 0 ] || error "$@"; exit 1; } @@ -126,7 +127,7 @@ for region in ${rlist}; do sfile="${TEMP_D}/${region}.self.list" # get a list of images owned by self - xc2 ximages describe-images --region "${region}" -o self > "${sfile}" || + retry 40 5 xc2 ximages describe-images --region "${region}" -o self > "${sfile}" || fail "failed to describe self-owned images in ${region}" # get a list of image ids to operate on ids=$(awk '-F\t' '$1 == r { print $2 }' "r=${region}" "$@") || @@ -151,14 +152,14 @@ { error "Warning: none of ids in ${region} were owned"; continue; } for id in ${owned}; do - ${dry_echo} xc2 modify-image-attribute --region "${region}" \ + ${dry_echo} retry 40 5 xc2 modify-image-attribute --region "${region}" \ --launch-permission "${modargs[@]}" ${id} || fail "failed to set perms for ${region}/${id}: ${modargs[*]}" snap=$(xc2 ximages describe-images --region "${region}" "${id}" | awk '$1 == "BLOCKDEVICEMAPPING" && $3 == "/dev/sda1" { print $4 }') [ -z "${snap}" ] || { - ${dry_echo} xc2 modify-snapshot-attribute --region "${region}" \ + ${dry_echo} retry 40 5 xc2 modify-snapshot-attribute --region "${region}" \ --create-volume-permission "${modargs[@]}" "${snap}" || fail "failed to set snapshot perms for (${snap}): ${region}/${id}: ${modargs[*]}"; } @@ -169,7 +170,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} retry 3 5 xc2 modify-image-attribute --region "${region}" \ + ${dry_echo} retry 40 5 xc2 modify-image-attribute --region "${region}" \ --launch-permission "${modargs[@]}" "${id}" || fail "failed to set perms for ${region}/${id}: ${modargs[*]}" @@ -177,7 +178,7 @@ awk '$1 == "BLOCKDEVICEMAPPING" && $3 == "/dev/sda1" { print $4 }') [ -z "${snap}" ] || { printf "%s %s %s\n" "${region}" "${snap}" "${id}${path:+ ${path}}" - ${dry_echo} retry 3 5 xc2 modify-snapshot-attribute --region "${region}" \ + ${dry_echo} retry 40 5 xc2 modify-snapshot-attribute --region "${region}" \ --create-volume-permission "${modargs[@]}" "${snap}" || fail "failed to set snapshot perms for (${snap}): ${region}/${id}: ${modargs[*]}"; } === modified file 'publish-image' --- publish-image 2016-02-23 21:11:35 +0000 +++ publish-image 2018-01-24 15:35:35 +0000 @@ -386,7 +386,7 @@ # so we check for 'ubuntu.images' rather than what was existing exist_reg="/${name//ubuntu\//ubuntu.}$" debug 1 "checking for existing registered image $region at ${exist_reg}" - tmp=$(xc2 ximages matching --region "$region" \ + tmp=$(retry 40 30s xc2 ximages matching --region "$region" \ "name ~ /${exist_reg//\//\\/}/ && name !~ /\/ebs\//" -o self) || fail "failed to check for existing manifest in $region" ------------------------------------------------------------ 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-02-01 21:40:25 +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-02-01 21:40:25 +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 ''