+ 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-20160615082712-0c5io3a37whh9d21 date: 2016-06-15 09:27:12 +0100 build-date: 2016-07-14 21:37:48 +0000 revno: 727 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 727 [merge] committer: Daniel Watkins branch nick: automated-ec2-builds timestamp: Wed 2016-06-15 09:27:12 +0100 message: Update EC2 dailies that are cleaned up to more closely reflect reality diff: === modified file 'daily-build-cleaner-schedule.txt' --- daily-build-cleaner-schedule.txt 2016-06-14 17:04:19 +0000 +++ daily-build-cleaner-schedule.txt 2016-06-14 18:43:21 +0000 @@ -13,6 +13,8 @@ # number-published keep-private-for-days region regex-for-manifest 5 30 all ^099720109477/ubuntu/images-testing/ubuntu-precise-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-precise-daily-%{a}-server-([^hwe]) +5 30 all ^099720109477/ubuntu/images-testing/ebs-io1/ubuntu-precise-daily-%{a}-server-([^hwe]) +5 30 all ^099720109477/ubuntu/images-testing/ebs-ssd/ubuntu-precise-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-precise-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing/hvm-io1/ubuntu-precise-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-precise-daily-%{a}-server-([^hwe]) @@ -26,8 +28,8 @@ 5 30 all ^099720109477/ubuntu/images-testing/hvm-io1/ubuntu-trusty-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-trusty-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing/hvm-instance/ubuntu-trusty-daily-%{a}-server-([^hwe]) -5 30 all ^099720109477/ubuntu/images-testing/ubuntu-utopic-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/ubuntu-wily-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-wily-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing/ebs-io1/ubuntu-wily-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing/ebs-ssd/ubuntu-wily-daily-%{a}-server @@ -36,19 +38,13 @@ 5 30 all ^099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-wily-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing/hvm-instance/ubuntu-wily-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-xenial-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-testing/ebs-io1/ubuntu-xenial-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/ubuntu-xenial-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing/ebs-ssd/ubuntu-xenial-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-xenial-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-testing/hvm-io1/ubuntu-xenial-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-xenial-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing/hvm-instance/ubuntu-xenial-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-yakkety-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-testing/ebs-io1/ubuntu-yakkety-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/ubuntu-yakkety-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing/ebs-ssd/ubuntu-yakkety-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-yakkety-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-testing/hvm-io1/ubuntu-yakkety-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-yakkety-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing/hvm-instance/ubuntu-yakkety-daily-%{a}-server @@ -63,7 +59,7 @@ 5 30 all ^099720109477/ubuntu/images-testing-dev/hvm/ubuntu-precise-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing-dev/hvm-instance/ubuntu-precise-daily-%{a}-server-([^hwe]) -5 30 all ^099720109477/ubuntu/images-testing-dev-dev/ubuntu-trusty-daily-%{a}-server-([^hwe]) +5 30 all ^099720109477/ubuntu/images-testing-dev/ubuntu-trusty-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing-dev/ebs-io1/ubuntu-trusty-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing-dev/ebs-ssd/ubuntu-trusty-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing-dev/ebs/ubuntu-trusty-daily-%{a}-server-([^hwe]) @@ -72,12 +68,8 @@ 5 30 all ^099720109477/ubuntu/images-testing-dev/hvm-ssd/ubuntu-trusty-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing-dev/hvm-instance/ubuntu-trusty-daily-%{a}-server-([^hwe]) -5 30 all ^099720109477/ubuntu/images-testing-dev-dev/ubuntu-xenial-daily-%{a}-server-([^hwe]) -5 30 all ^099720109477/ubuntu/images-testing-dev/ebs-io1/ubuntu-xenial-daily-%{a}-server-([^hwe]) +5 30 all ^099720109477/ubuntu/images-testing-dev/ubuntu-xenial-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing-dev/ebs-ssd/ubuntu-xenial-daily-%{a}-server-([^hwe]) -5 30 all ^099720109477/ubuntu/images-testing-dev/ebs/ubuntu-xenial-daily-%{a}-server-([^hwe]) -5 30 all ^099720109477/ubuntu/images-testing-dev/hvm/ubuntu-xenial-daily-%{a}-server-([^hwe]) -5 30 all ^099720109477/ubuntu/images-testing-dev/hvm-io1/ubuntu-xenial-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing-dev/hvm-ssd/ubuntu-xenial-daily-%{a}-server-([^hwe]) 5 30 all ^099720109477/ubuntu/images-testing-dev/hvm-instance/ubuntu-xenial-daily-%{a}-server-([^hwe]) @@ -110,20 +102,12 @@ 5 30 all ^099720109477/ubuntu/images-proposed/hvm-instance/ubuntu-wily-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-proposed/ubuntu-xenial-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-proposed/ebs/ubuntu-xenial-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-proposed/ebs-io1/ubuntu-xenial-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-proposed/ebs-ssd/ubuntu-xenial-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-proposed/hvm/ubuntu-xenial-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-proposed/hvm-io1/ubuntu-xenial-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-proposed/hvm-ssd/ubuntu-xenial-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-proposed/hvm-instance/ubuntu-xenial-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-proposed/ubuntu-yakkety-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-proposed/ebs/ubuntu-yakkety-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-proposed/ebs-io1/ubuntu-yakkety-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-proposed/ebs-ssd/ubuntu-yakkety-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-proposed/hvm/ubuntu-yakkety-daily-%{a}-server -5 30 all ^099720109477/ubuntu/images-proposed/hvm-io1/ubuntu-yakkety-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-proposed/hvm-ssd/ubuntu-yakkety-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-proposed/hvm-instance/ubuntu-yakkety-daily-%{a}-server @@ -133,6 +117,8 @@ 5 30 all ^099720109477/ubuntu/images-testing/ubuntu-precise-daily-%{a}-server-hwe-t 5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-precise-daily-%{a}-server-hwe-t +5 30 all ^099720109477/ubuntu/images-testing/ebs-io1/ubuntu-precise-daily-%{a}-server-hwe-t +5 30 all ^099720109477/ubuntu/images-testing/ebs-ssd/ubuntu-precise-daily-%{a}-server-hwe-t 5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-precise-daily-%{a}-server-hwe-t 5 30 all ^099720109477/ubuntu/images-testing/hvm-io1/ubuntu-precise-daily-%{a}-server-hwe-t 5 30 all ^099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-precise-daily-%{a}-server-hwe-t @@ -155,6 +141,8 @@ 5 30 all ^099720109477/ubuntu/images-testing/ubuntu-trusty-daily-%{a}-server-hwe-u 5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-trusty-daily-%{a}-server-hwe-u +5 30 all ^099720109477/ubuntu/images-testing/ebs-io1/ubuntu-trusty-daily-%{a}-server-hwe-u +5 30 all ^099720109477/ubuntu/images-testing/ebs-ssd/ubuntu-trusty-daily-%{a}-server-hwe-u 5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-trusty-daily-%{a}-server-hwe-u 5 30 all ^099720109477/ubuntu/images-testing/hvm-io1/ubuntu-trusty-daily-%{a}-server-hwe-u 5 30 all ^099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-trusty-daily-%{a}-server-hwe-u @@ -178,6 +166,8 @@ 5 30 all ^099720109477/ubuntu/images-testing/ubuntu-trusty-daily-%{a}-server-hwe-v 5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-trusty-daily-%{a}-server-hwe-v +5 30 all ^099720109477/ubuntu/images-testing/ebs-io1/ubuntu-trusty-daily-%{a}-server-hwe-v +5 30 all ^099720109477/ubuntu/images-testing/ebs-ssd/ubuntu-trusty-daily-%{a}-server-hwe-v 5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-trusty-daily-%{a}-server-hwe-v 5 30 all ^099720109477/ubuntu/images-testing/hvm-io1/ubuntu-trusty-daily-%{a}-server-hwe-v 5 30 all ^099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-trusty-daily-%{a}-server-hwe-v @@ -200,6 +190,8 @@ 5 30 all ^099720109477/ubuntu/images-testing/ubuntu-trusty-daily-%{a}-server-hwe-w 5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-trusty-daily-%{a}-server-hwe-w +5 30 all ^099720109477/ubuntu/images-testing/ebs-ssd/ubuntu-trusty-daily-%{a}-server-hwe-w +5 30 all ^099720109477/ubuntu/images-testing/ebs-io1/ubuntu-trusty-daily-%{a}-server-hwe-w 5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-trusty-daily-%{a}-server-hwe-w 5 30 all ^099720109477/ubuntu/images-testing/hvm-io1/ubuntu-trusty-daily-%{a}-server-hwe-w 5 30 all ^099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-trusty-daily-%{a}-server-hwe-w @@ -223,6 +215,8 @@ 5 30 all ^099720109477/ubuntu/images-testing/ubuntu-trusty-daily-%{a}-server-hwe-x 5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-trusty-daily-%{a}-server-hwe-x +5 30 all ^099720109477/ubuntu/images-testing/ebs-io1/ubuntu-trusty-daily-%{a}-server-hwe-x +5 30 all ^099720109477/ubuntu/images-testing/ebs-ssd/ubuntu-trusty-daily-%{a}-server-hwe-x 5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-trusty-daily-%{a}-server-hwe-x 5 30 all ^099720109477/ubuntu/images-testing/hvm-io1/ubuntu-trusty-daily-%{a}-server-hwe-x 5 30 all ^099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-trusty-daily-%{a}-server-hwe-x ------------------------------------------------------------ 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-20160621140643-bdzxkzsebr2nhf5o date: 2016-06-21 09:06:43 -0500 build-date: 2016-07-14 21:37:49 +0000 revno: 645 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 645 [merge] committer: Robert C Jennings branch nick: ec2-publishing-scripts timestamp: Tue 2016-06-21 09:06:43 -0500 message: Don't write download query data for yakkety and later This will be handled by a separate process, so it's disentangled from EC2 publication. diff: === modified file 'publicize-build' --- publicize-build 2016-04-19 08:06:48 +0000 +++ publicize-build 2016-06-21 10:59:05 +0000 @@ -76,6 +76,15 @@ outfile="${outfile}.txt" url_file="${TEMP_D}/urls.txt" + case ${suite} in + precise|trusty|wily|xenial) + write_download_query_data="true" + ;; + *) + write_download_query_data="false" + ;; + esac + local arch ec2_arches="" f="" tarball="" path="" dashed="" local all_arches="armel armhf i386 amd64 ppc64el arm64 s390x powerpc" ec2_arches=$(awk '-F\t' '{print $6}' "${outfile}" | sort -u) @@ -164,8 +173,10 @@ "${serial_fix}" > "${cf_ser_fix}" ]]; then cat "${imgf}" > "${curfile}" || { error "failed to write ${curfile}"; return 1; } - cat "${url_file}" > "${url_curfile}" || - { error "failed to write ${url_curfile}"; return 1; } + if [ ${write_download_query_data} = "true" ]; then + cat "${url_file}" > "${url_curfile}" || + { error "failed to write ${url_curfile}"; return 1; } + fi error "updated ${curfile}" fi @@ -201,19 +212,20 @@ error "updated ${outfile}" debug_file 1 ${imgf_t} "after sort outfile contains:" - # if label/serial/suite/bname exists in ${url_outfile} then do not append - found="" - [ -e "${url_outfile}" ] && - found=$(awk '-F\t' "${cond} { print \$8 }" "suite=${suite}" \ - "label=${label}" "serial=${serial}" "bname=${bname}" "${url_outfile}" ) - if [ -n "${found}" ]; then - error "build already present in ${url_outfile}, not appending" - else - cat "${url_file}" >> "${url_outfile}" || - { error "failed to write ${url_file} to ${url_outfile}"; return 1; } - error "updated ${url_outfile}" + if [ ${write_download_query_data} = "true" ]; then + # if label/serial/suite/bname exists in ${url_outfile} then do not append + found="" + [ -e "${url_outfile}" ] && + found=$(awk '-F\t' "${cond} { print \$8 }" "suite=${suite}" \ + "label=${label}" "serial=${serial}" "bname=${bname}" "${url_outfile}" ) + if [ -n "${found}" ]; then + error "build already present in ${url_outfile}, not appending" + else + cat "${url_file}" >> "${url_outfile}" || + { error "failed to write ${url_file} to ${url_outfile}"; return 1; } + error "updated ${url_outfile}" + fi fi - } VERBOSE=0 ------------------------------------------------------------ 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: 2016-07-14 21:37:49 +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: 2016-07-14 21:37:50 +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 ''