+ 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-20121025122633-fq8n2rbbx3xyjbq3 date: 2012-10-25 14:26:33 +0200 build-date: 2012-10-28 04:18:58 +0000 revno: 523 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 523 committer: Ben Howard branch nick: automated-ec2-builds timestamp: Thu 2012-10-25 14:26:33 +0200 message: Finishing enablement of Raring in the build system diff: === modified file 'README.new-release' --- README.new-release 2012-04-27 21:39:39 +0000 +++ README.new-release 2012-10-25 12:26:33 +0000 @@ -1,3 +1,13 @@ +- Ubuntu 13.04 (Raring Ringtail) enablement + - No longer using crontab; build system has been re-implemented within + Jenkins + - copy conf/N-1-desktop.conf to conf/N-desktop.conf (bzr add) + - copy conf/N-1-server.conf to conf/N-server.conf (bzr add) + - add entries to daily-build-cleaner-schedule.txt + - add entries to remove-old-dailies + - copy ovf/conf/N-1-server.conf to ovf/conf/N-server.conf (bzr add) + + - Ubuntu 12.10 (Quantal Quetzal) enablement - edit crontab in automated-ec2-builds - copy conf/N-1-desktop.conf to conf/N-desktop.conf (bzr add) === modified file 'daily-build-cleaner-schedule.txt' --- daily-build-cleaner-schedule.txt 2012-08-27 21:22:41 +0000 +++ daily-build-cleaner-schedule.txt 2012-10-25 12:26:33 +0000 @@ -43,6 +43,13 @@ 5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-quantal-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-quantal-daily-%{a}-desktop 5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-quantal-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/ubuntu-raring-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/ubuntu-raring-daily-%{a}-desktop +5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-raring-daily-%{a}-desktop +5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-raring-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-raring-daily-%{a}-desktop +5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-raring-daily-%{a}-server + # test images 5 30 all ^099720109477/ubuntu/images-testing-dev/ubuntu-hardy-daily-%{a}-server @@ -81,6 +88,12 @@ 5 30 all ^099720109477/ubuntu/images-testing-dev/ebs/ubuntu-quantal-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing-dev/hvm/ubuntu-quantal-daily-%{a}-desktop 5 30 all ^099720109477/ubuntu/images-testing-dev/hvm/ubuntu-quantal-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing-dev/ubuntu-raring-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing-dev/ubuntu-raring-daily-%{a}-desktop +5 30 all ^099720109477/ubuntu/images-testing-dev/ebs/ubuntu-raring-daily-%{a}-desktop +5 30 all ^099720109477/ubuntu/images-testing-dev/ebs/ubuntu-raring-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing-dev/hvm/ubuntu-raring-daily-%{a}-desktop +5 30 all ^099720109477/ubuntu/images-testing-dev/hvm/ubuntu-raring-daily-%{a}-server # Rescue images 5 30 all ^099720109477/ubuntu/images-testing-dev/ubuntu-quantal-daily-%{a}-server === modified file 'remove-old-dailies' --- remove-old-dailies 2012-04-27 21:39:39 +0000 +++ remove-old-dailies 2012-10-25 12:26:33 +0000 @@ -7,7 +7,7 @@ SAFE_FILE=.save BASES=( /srv/ec2-images/server /srv/ec2-images/desktop ) -RELS="hardy intrepid jaunty karmic lucid maverick natty oneiric precise quantal" +RELS="hardy intrepid jaunty karmic lucid maverick natty oneiric precise quantal raring" # keep ${SAVE_COUNT} builds or builds to ${SAVE_DAYS} days ago, whichever is greater. export LANG=C + 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-20121026102214-eihjn2rk33cflteb date: 2012-10-26 12:22:14 +0200 build-date: 2012-10-28 04:18:59 +0000 revno: 489 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 489 committer: Ben Howard branch nick: ec2-publishing-scripts timestamp: Fri 2012-10-26 12:22:14 +0200 message: Fixed the build-api output location diff: === modified file 'publicize-build' --- publicize-build 2012-10-26 07:41:38 +0000 +++ publicize-build 2012-10-26 10:22:14 +0000 @@ -187,7 +187,7 @@ --reg "${curfile}" \ --files "${build_d}" \ --build "${url_curfile}" \ - --outdir "${PUBLISH_BASE}/query2" \ + --outdir "${PUBLISH_BASE}/beta/api" \ --db "/srv/builder/query2/query2.db" fi + 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-20121025025438-sjc5p8r097uwj83h date: 2012-10-25 04:54:38 +0200 build-date: 2012-10-28 04:18:59 +0000 revno: 1855 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1855 committer: Ben Howard branch nick: live-build timestamp: Thu 2012-10-25 04:54:38 +0200 message: Fix for missing required LXC tree diff: === modified file 'scripts/build/lb_binary_virtual-hdd-raw' --- scripts/build/lb_binary_virtual-hdd-raw 2012-06-11 17:24:38 +0000 +++ scripts/build/lb_binary_virtual-hdd-raw 2012-10-25 02:54:38 +0000 @@ -95,11 +95,32 @@ else case "${LB_BINARY_FILESYSTEM}" in ext2|ext3|ext4) - Echo_message "Creating virtual filesystem..." + Echo_message "Creating virtual filesystem...(created outside chroot)" dd if=/dev/zero of=binary-raw.img bs=1024k count=0 seek=${LB_HDD_SIZE} ${LB_ROOT_COMMAND} mkfs.${LB_BINARY_FILESYSTEM} -F binary-raw.img -L ${LB_HDD_FILESYSTEM_LABEL} -U ${FS_UUID} ${LB_ROOT_COMMAND} mount -o loop binary-raw.img binary-raw.tmp - rsync -aXHAS --one-file-system --sparse --exclude='/proc/*' --exclude="/sys/*" --exclude="/dev/*" chroot/* binary-raw.tmp/ 2> /dev/null + rsync -aXHAS \ + --one-file-system \ + --sparse \ + --exclude='/proc/*' \ + --exclude="/sys/*" \ + --exclude="/dev/*" \ + chroot/* binary-raw.tmp/ 2> /dev/null + + # Create bare LXC device tree + Echo_message "Populating virtual filesystem with bare dev tree" + mknod -m 666 binary-raw.tmp/null c 1 3 + mknod -m 666 binary-raw.tmp/zero c 1 5 + mknod -m 666 binary-raw.tmp/random c 1 8 + mknod -m 666 binary-raw.tmp/urandom c 1 9 + mkdir -m 755 binary-raw.tmp/pts + mkdir -m 1777 binary-raw.tmp/shm + mknod -m 666 binary-raw.tmp/tty c 5 0 + mknod -m 600 binary-raw.tmp/console c 5 1 + mknod -m 666 binary-raw.tmp/tty0 c 4 0 + mknod -m 666 binary-raw.tmp/full c 1 7 + mknod -m 600 binary-raw.tmp/initctl p + mknod -m 666 binary-raw.tmp/ptmx c 5 2 ;; esac fi + 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-28 04:19:00 +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 ''