+ 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@canonical.com-20120921153005-frduv3m2r5qwby4g date: 2012-09-21 09:30:05 -0600 build-date: 2012-10-03 04:39:56 +0000 revno: 518 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 518 committer: Ben Howard branch nick: automated-ec2-builds timestamp: Fri 2012-09-21 09:30:05 -0600 message: Disabled Desktop QCow builds diff: === modified file 'conf/quantal-desktop.conf' --- conf/quantal-desktop.conf 2012-09-18 20:13:26 +0000 +++ conf/quantal-desktop.conf 2012-09-21 15:30:05 +0000 @@ -19,11 +19,4 @@ nogrub=0 img_arches="amd64 i386" build_type="desktop" -vmdk_create=0 -vmdk_ovf=0 -qcow2_create=1 -qcow2_ovf=1 -ovf_default=qcow2 -img_size=4G -create_root_tgz=0 + 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@canonical.com-20121001204520-6bxbwjnjo7ecuhje date: 2012-10-01 14:45:20 -0600 build-date: 2012-10-03 04:39:56 +0000 revno: 483 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 483 committer: Ben Howard branch nick: ec2-publishing-scripts timestamp: Mon 2012-10-01 14:45:20 -0600 message: Only generate full queries to reduce load and enforce strict queries for flat files diff: === modified file 'querier.py' --- querier.py 2012-09-28 23:00:39 +0000 +++ querier.py 2012-10-01 20:45:20 +0000 @@ -598,30 +598,31 @@ requests_c.append(string) r = "arch=%s" % arch - requests_b.append("%s&%s" % (build_pre, r)) - requests_c_append("%s&%s" % (cloud_pre, r)) +# requests_b.append("%s&%s" % (build_pre, r)) +# requests_c_append("%s&%s" % (cloud_pre, r)) for build_name in suite_config['build_name']: s = "build_name=%s" % build_name - requests_b.append("%s&%s&%s" % (build_pre, r, s)) - requests_c_append("%s&%s&%s" % (cloud_pre, r, s)) +# requests_b.append("%s&%s&%s" % (build_pre, r, s)) +# requests_c_append("%s&%s&%s" % (cloud_pre, r, s)) for rel in release_tags: t = "release_tag=%s" % rel requests_b.append("%s&%s&%s&%s" % (build_pre, r, s, t)) - requests_c_append("%s&%s&%s&%s" % (cloud_pre, r, s, t)) +# requests_c_append("%s&%s&%s&%s" % (cloud_pre, r, s, t)) for itype in instance_types: i = "instance_type=%s" % itype - requests_c_append("%s&%s&%s&%s" % (cloud_pre, r, s, i)) +# requests_c_append("%s&%s&%s&%s" % (cloud_pre, r, s, i)) for reg in regions: e = "region=%s" % reg - requests_c_append("%s&%s&%s&%s&%s" % (cloud_pre, r, s, i, e)) +# requests_c_append("%s&%s&%s&%s&%s" % (cloud_pre, r, s, i, e)) + requests_c_append("%s&%s&%s&%s&%s&%s" % (cloud_pre, r, s, i, e, t)) for reg in regions: e = "region=%s" % reg - requests_c_append("%s&%s&%s&%s" % (cloud_pre, r, s, e)) +# requests_c_append("%s&%s&%s&%s" % (cloud_pre, r, s, e)) + 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-20120911204823-b27wnyuurqsx2pyi date: 2012-09-11 14:48:23 -0600 build-date: 2012-10-03 04:39:57 +0000 revno: 1854 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1854 committer: Ben Howard branch nick: live-build timestamp: Tue 2012-09-11 14:48:23 -0600 message: Allow for disabling source builds, as they are not needed diff: === modified file 'scripts/build/lb_binary' --- scripts/build/lb_binary 2012-09-05 19:19:59 +0000 +++ scripts/build/lb_binary 2012-09-11 20:48:23 +0000 @@ -113,4 +113,3 @@ lb chroot_selinuxfs remove ${*} lb chroot_proc remove ${*} lb chroot_devpts remove ${*} -set +x === modified file 'scripts/build/lb_source' --- scripts/build/lb_source 2011-11-28 17:56:01 +0000 +++ scripts/build/lb_source 2012-09-11 20:48:23 +0000 @@ -36,6 +36,10 @@ # Setup cleanup function Setup_cleanup +if [ "${LB_SOURCE}" != "true" ]; then + exit 0 +fi + # Enabling network in chroot lb chroot_hosts install ${*} lb chroot_resolv install ${*} + 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: 2012-10-03 04:39:57 +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 ''