+ 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: robert.jennings@canonical.com-20180326151817-w4f6svg9zwvpxexr date: 2018-03-26 10:18:17 -0500 build-date: 2018-06-27 21:42:05 +0000 revno: 735 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 735 [merge] committer: Robert C Jennings branch nick: automated-ec2-builds timestamp: Mon 2018-03-26 10:18:17 -0500 message: Merge lp:~rcj/vmbuilder/automated-ec2-builds into lp:~ubuntu-on-ec2/vmbuilder/automated-ec2-builds [a=rcj] [r=philroche,rcj,tribaal] remove-old-dailies: Clean up bionic MP: https://code.launchpad.net/~rcj/vmbuilder/automated-ec2-builds/+merge/342103 diff: === modified file 'remove-old-dailies' --- remove-old-dailies 2017-10-18 16:21:10 +0000 +++ remove-old-dailies 2018-03-26 15:12:08 +0000 @@ -7,7 +7,7 @@ SAFE_FILE=.save BASES=( /srv/ec2-images/server ) -RELS="trusty xenial zesty artful" +RELS="trusty xenial zesty artful bionic" # keep ${SAVE_COUNT} builds or builds to ${SAVE_DAYS} days ago, whichever is greater. export LANG=C ------------------------------------------------------------ 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-20180511140210-wn5xclh6nq76568d date: 2018-05-11 09:02:10 -0500 build-date: 2018-06-27 21:42:05 +0000 revno: 662 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 662 [merge] committer: Robert C Jennings branch nick: ec2-publishing-scripts timestamp: Fri 2018-05-11 09:02:10 -0500 message: Merge lp:~rcj/ubuntu-on-ec2/ec2-publishing-scripts into lp:~ubuntu-on-ec2/ubuntu-on-ec2/ec2-publishing-scripts [a=rcj] [r=daniel-thewatkins,philroche] ubuntu-adj2version: Explicit release definition Since we've looped in the alphabet and are approaching dd-series this code would have returned 6.06 for our next release rather than 19.04. The safest way to do this is by explicit suite matching to release version. MP: https://code.launchpad.net/~rcj/ubuntu-on-ec2/ec2-publishing-scripts/+merge/345373 diff: === modified file 'ubuntu-adj2version' --- ubuntu-adj2version 2017-11-10 14:12:28 +0000 +++ ubuntu-adj2version 2018-05-10 16:57:40 +0000 @@ -9,52 +9,49 @@ such will fail to function after 'zippy zebra' Example: - - $ ${0##*/} hardy - 8.04 - - $ ${0##*/} PRETTY - 12.04 - - $ ${0##*/} yearning - 16.10 + - $ ${0##*/} xenial + 16.04 + - $ ${0##*/} ARTFUL + 17.10 EOF } error() { echo "$@" 1>&2; } fail() { [ $# -eq 0 ] || error "$@"; exit 1; } + ubuntu_adj2ver() { - # over engineered function, convert ubuntu adjective to version - # based on its first letter. case "$(echo $1 | tr "[:upper:]" "[:lower:]")" in - artful) - _RET="17.10" - return 0 - ;; - bionic) - _RET="18.04" - return 0 - ;; - esac - local letter1="" list=defghijklmnopqrstuvwxyz - local baseyear=6 year="" month="04" tmp="" relnum="" - - [ "$1" = "warty" -o "$1" = "Warty" -o "$1" = "WARTY" ] && - { _RET="5.10"; return 0; } - - letter1=$(echo "${1}" | sed 's,\(.\).*,\1,') || return 1 - case "${letter1}" in - [A-Z]) letter1=$(echo "${letter1}" | tr "[:upper:]" "[:lower:]");; - [a-z]) :;; - *) return 1; - esac - - tmp=${list%${letter1}*} - [ "${tmp}" != "${list}" ] || return 1; - relnum=${#tmp} # number of release starting with 6.04 - year=$((${relnum}/2 + ${baseyear})) - - # if this is an even numbered release, then its in the 10th month - # odd numbered are in the 4th. - [ $((${relnum} % 2)) -eq 0 ] || month="10" - _RET="${year}.${month}" + warty) _RET="4.10" ;; + hoary) _RET="5.04" ;; + breezy) _RET="5.10" ;; + dapper) _RET="6.06" ;; + edgy) _RET="6.10" ;; + feisty) _RET="7.04" ;; + gutsy) _RET="7.10" ;; + hardy) _RET="8.04" ;; + intrepid) _RET="8.10" ;; + jaunty) _RET="9.04" ;; + karmic) _RET="9.10" ;; + lucid) _RET="10.04" ;; + maverick) _RET="10.10" ;; + natty) _RET="11.04" ;; + oneiric) _RET="11.10" ;; + precise) _RET="12.04" ;; + quantal) _RET="12.10" ;; + raring) _RET="13.04" ;; + saucy) _RET="13.10" ;; + trusty) _RET="14.04" ;; + utopic) _RET="14.10" ;; + vivid) _RET="15.04" ;; + wily) _RET="15.10" ;; + xenial) _RET="16.04" ;; + yakkety) _RET="16.10" ;; + zesty) _RET="17.04" ;; + artful) _RET="17.10" ;; + bionic) _RET="18.04" ;; + cosmic) _RET="18.10" ;; + *) fail "Unknown suite $1" ;; + esac } [ $# -eq 1 ] || { Usage 1>&2; fail "must give single adjective"; } ------------------------------------------------------------ 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-06-27 21:42:06 +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-06-27 21:42:06 +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 ''