+ 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@ubuntu.com-20140424162940-jbvl61qwb0biqrkk date: 2014-04-24 10:29:40 -0600 build-date: 2014-04-28 07:04:57 +0000 revno: 628 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 628 committer: Ben Howard branch nick: trunk timestamp: Thu 2014-04-24 10:29:40 -0600 message: Added Utopic Unicorn definitions. diff: === added file 'conf/utopic-arm-server.conf' --- conf/utopic-arm-server.conf 1970-01-01 00:00:00 +0000 +++ conf/utopic-arm-server.conf 2014-04-24 16:29:40 +0000 @@ -0,0 +1,31 @@ +suite="utopic" +description="Ubuntu 14.10 (Utopic Unicorn)" +copy_out_kernels=1 +unpublished_ramdisks="" +package_img_tgz=0 +build_name="server" +root_fs_size="1400" +root_fs_label="cloudimg-rootfs" +publish_ec2=0 +cat_partfile() { + local size=${2}; + printf "%s\n" "root ${size} a1" +} +build_type="server" +loader="" +floppy="" +nogrub=1 +img_arches="armhf" +create_root_tgz=1 +qcow2_create=1 +qcow2_ovf=0 +qemu_img=0 +create_root_tgz=1 +lb_conf=( sudo "LB_BASE=%L" "PATH=%x" "%P/lb_config" "--distribution=%d" + "--mode=ubuntu" "--build-with-chroot=true" "--chroot-filesystem=plain" + "--system=normal" "--package-list=ubuntu-cloud-arm-t" "--hdd-fs-label=%l" + "--hdd-new-fstab" "--root-mount-by=LABEL" "--binary-images=binary-hdd-raw" + "--bootloader=none" "--hdd-size=%s" "--binary-filesystem=ext4" + "--bootstrap-qemu-static=%q" "--bootstrap-qemu-arch=%A" "--architecture=%A" + "--cache=false" "--source=false" "--linux-flavours=generic-lpae" ) +purge_roottgz_pkgs=( "linux-*" ) === added file 'conf/utopic-arm64-server.conf' --- conf/utopic-arm64-server.conf 1970-01-01 00:00:00 +0000 +++ conf/utopic-arm64-server.conf 2014-04-24 16:29:40 +0000 @@ -0,0 +1,32 @@ +suite="utopic" +description="Ubuntu 14.10 (Utopic Unicorn)" +copy_out_kernels=1 +unpublished_ramdisks="" +package_img_tgz=0 +build_name="server" +root_fs_size="1400" +root_fs_label="cloudimg-rootfs" +publish_ec2=0 +cat_partfile() { + local size=${2}; + printf "%s\n" "root ${size} a1" +} +build_type="server" +loader="" +floppy="" +nogrub=1 +img_arches="arm64" +create_root_tgz=1 +qcow2_create=1 +qcow2_uefi_create=1 +qcow2_ovf=0 +qemu_img=0 +create_root_tgz=1 +lb_conf=( sudo "LB_BASE=%L" "PATH=%x" "%P/lb_config" "--distribution=%d" + "--mode=ubuntu" "--build-with-chroot=true" "--chroot-filesystem=plain" + "--system=normal" "--package-list=ubuntu-cloud-arm-t" "--hdd-fs-label=%l" + "--hdd-new-fstab" "--root-mount-by=LABEL" "--binary-images=binary-hdd-raw" + "--bootloader=none" "--hdd-size=%s" "--binary-filesystem=ext4" + "--bootstrap-qemu-static=%q" "--bootstrap-qemu-arch=%A" "--architecture=%A" + "--cache=false" "--source=false" "--linux-flavours=generic" ) +purge_roottgz_pkgs=( "linux-*" ) === added file 'conf/utopic-desktop-server.conf' --- conf/utopic-desktop-server.conf 1970-01-01 00:00:00 +0000 +++ conf/utopic-desktop-server.conf 2014-04-24 16:29:40 +0000 @@ -0,0 +1,22 @@ +suite="utopic" +description="Ubuntu 12.10 (Utopic Unicorn)" +lb_conf=( sudo "LB_BASE=%L" "PATH=%x" "%P/lb_config" "--distribution=%d" "--mode=ubuntu" "--build-with-chroot=true" + "--chroot-filesystem=plain" "--system=normal" "--package-list=ubuntu-cloud-desktop" "--hdd-fs-label=%l" "--hdd-new-fstab" + "--root-mount-by=LABEL" "--binary-images=binary-hdd-raw" "--bootloader=none" "--hdd-size=%s" "--binary-filesystem=ext4" + "--architecture=%A" "--cache=false" "--linux-flavours=virtual" "--source=false") +copy_out_kernels=1 +unpublished_ramdisks="." +build_name="desktop" +root_fs_size="4096" +root_fs_label="cloudimg-rootfs" +publish_ec2=1 +cat_partfile() { + local size=${2}; + printf "%s\n" "root ${size} a1" +} +loader="grub-maverick-20100729.img" +floppy="floppy-maverick-20111012.img" +nogrub=0 +img_arches="amd64 i386" +build_type="desktop" +purge_roottgz_pkgs=( "linux-*" "grub-*" ) === added file 'conf/utopic-ppc64el-server.conf' --- conf/utopic-ppc64el-server.conf 1970-01-01 00:00:00 +0000 +++ conf/utopic-ppc64el-server.conf 2014-04-24 16:29:40 +0000 @@ -0,0 +1,52 @@ +suite="utopic" +description="Ubuntu 14.10 (Utopic Unicorn)" +copy_out_kernels=1 + +lb_conf=( sudo "LB_BASE=%L" "PATH=%x" "%P/lb_config" + "--architecture=%A" + "--binary-filesystem=ext4" + "--binary-images=binary-hdd-raw" + "--bootloader=none" + "--build-with-chroot=true" + "--cache=false" + "--cache-indices=false" + "--chroot-filesystem=plain" + "--distribution=%d" + "--hdd-fs-label=%l" + "--hdd-new-fstab" + "--hdd-size=%s" + "--linux-flavours=virtual" + "--mode=ubuntu" + "--package-list=ubuntu-cloud" + "--root-mount-by=LABEL" + "--source=false" + "--system=normal" +) + +package_img_tgz=0 +unpublished_ramdisks="." +build_name="server" +root_fs_size="1408" +root_fs_label="cloudimg-rootfs" +publish_ec2=0 +cat_partfile() { + local size=${2}; + printf "%s\n" "root ${size} a1" +} +build_type="server" +loader="" +floppy="" +nogrub=1 +img_arches="ppc64el" +vmdk_create=0 +vmdk_ovf=0 +qcow2_create=0 +qcow2_ovf=0 +qcow2_gpt_create=1 +vmdk_gpt_create=0 +ovf_default=qcow2 +img_size=2G +create_root_tgz=1 +purge_roottgz_pkgs=( "linux-*" "grub-*" ) + +# vi: syntax=sh === added file 'conf/utopic-server.conf' --- conf/utopic-server.conf 1970-01-01 00:00:00 +0000 +++ conf/utopic-server.conf 2014-04-24 16:29:40 +0000 @@ -0,0 +1,35 @@ +suite="utopic" +description="Ubuntu 14.10 (Utopic Unicorn)" +copy_out_kernels=1 +ovf_cmd=( sudo "%d/ovf/diskimg2ovf" --conf=utopic-server.conf + --template=ubuntu-ovf-v1-%t.tmpl "--prefix=%p" "--disk=%r" "--size=%s" "--out=%o" ) +lb_conf=( sudo "LB_BASE=%L" "PATH=%x" "%P/lb_config" "--distribution=%d" "--mode=ubuntu" "--build-with-chroot=true" + "--chroot-filesystem=plain" "--system=normal" "--package-list=ubuntu-cloud-t" "--hdd-fs-label=%l" "--hdd-new-fstab" + "--root-mount-by=LABEL" "--binary-images=binary-hdd-raw" "--bootloader=none" "--hdd-size=%s" "--binary-filesystem=ext4" + "--architecture=%A" "--cache=false" "--linux-flavours=virtual" "--cache-indices=false" "--source=false") +package_img_tgz=0 +unpublished_ramdisks="." +build_name="server" +root_fs_size="1408" +root_fs_label="cloudimg-rootfs" +publish_ec2=1 +cat_partfile() { + local size=${2}; + printf "%s\n" "root ${size} a1" +} +build_type="server" +loader="grub-maverick-20100729.img" +floppy="floppy-maverick-20111012.img" +nogrub=0 +img_arches="amd64 i386" +extra_arches="utopic-arm-server.conf utopic-aarch64-server.conf" +vmdk_create=0 +vmdk_ovf=0 +qcow2_create=1 +qcow2_ovf=1 +qcow2_uefi_create=1 +vmdk_uefi_create=0 +ovf_default=qcow2 +img_size=2G +create_root_tgz=1 +purge_roottgz_pkgs=( "linux-*" "grub-*" ) === modified file 'daily-build-cleaner-schedule.txt' --- daily-build-cleaner-schedule.txt 2014-04-07 15:54:00 +0000 +++ daily-build-cleaner-schedule.txt 2014-04-24 16:29:40 +0000 @@ -61,6 +61,12 @@ 5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-trusty-daily-%{a}-server 5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-trusty-daily-%{a}-desktop 5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-trusty-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/ubuntu-utopic-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/ubuntu-utopic-daily-%{a}-desktop +5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-utopic-daily-%{a}-desktop +5 30 all ^099720109477/ubuntu/images-testing/ebs/ubuntu-utopic-daily-%{a}-server +5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-utopic-daily-%{a}-desktop +5 30 all ^099720109477/ubuntu/images-testing/hvm/ubuntu-utopic-daily-%{a}-server === added file 'ovf/conf/utopic-server-amd64.conf' --- ovf/conf/utopic-server-amd64.conf 1970-01-01 00:00:00 +0000 +++ ovf/conf/utopic-server-amd64.conf 2014-04-24 16:29:40 +0000 @@ -0,0 +1,8 @@ +VIRTUAL_SYSTEM_NAME: 'Ubuntu' +VIRTUAL_SYSTEM_OS_INFO: 'Ubuntu 14.10 (Utopic Unicorn) Server' +VIRTUAL_SYSTEM_IDENTIFIER: 'Ubuntu 14.10 (Utopic Unicorn) Server' +VIRTUAL_SYSTEM_GUEST: 'ubuntu64Guest' +VIRTUAL_SYSTEM_DESC: 'Ubuntu Linux (64 bit)' +VIRTUAL_SYSTEM_VM_NAME: 'Ubuntu Server 14.10 amd64' +ANNOTATION_INFO: For more information, see http://ubuntu.com +ANNOTATION: This is Ubuntu Server. === added file 'ovf/conf/utopic-server.conf' --- ovf/conf/utopic-server.conf 1970-01-01 00:00:00 +0000 +++ ovf/conf/utopic-server.conf 2014-04-24 16:29:40 +0000 @@ -0,0 +1,8 @@ +VIRTUAL_SYSTEM_NAME: 'Ubuntu' +VIRTUAL_SYSTEM_OS_INFO: 'Ubuntu 14.10 (Utopic Unicorn) Server' +VIRTUAL_SYSTEM_IDENTIFIER: 'Ubuntu 14.10 (Utopic Unicorn) Server' +VIRTUAL_SYSTEM_GUEST: 'ubuntuGuest' +VIRTUAL_SYSTEM_DESC: 'Ubuntu Linux' +VIRTUAL_SYSTEM_VM_NAME: 'Ubuntu Server 14.10 i386' +ANNOTATION_INFO: For more information, see http://ubuntu.com +ANNOTATION: This is Ubuntu Server. + 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-20140425142406-259u1s2n0oh8a29x date: 2014-04-25 09:24:06 -0500 build-date: 2014-04-28 07:04:58 +0000 revno: 547 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 547 committer: Robert Jennings branch nick: ec2-publishing-scripts timestamp: Fri 2014-04-25 09:24:06 -0500 message: publicize-build: fix arithmetic comparison diff: === modified file 'publicize-build' --- publicize-build 2014-04-24 13:37:03 +0000 +++ publicize-build 2014-04-25 14:24:06 +0000 @@ -11,13 +11,13 @@ debug() { local level=${1} shift; - [ "${level}" -gt "${VERBOSITY}" ] && return + [ ${level} -gt ${VERBOSITY} ] && return error "$(date):" "${@}" } debug_file() { local level=${1}; shift; local file=${1}; shift; - [ "${level}" -gt "${VERBOSITY}" ] && return + [ ${level} -gt ${VERBOSITY} ] && return echo "$@" 1>&2 cat ${file} 1>&2 echo 1>&2 + 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-20140331230745-0qe08186ylyg1pkr date: 2014-03-31 17:07:45 -0600 build-date: 2014-04-28 07:04:58 +0000 revno: 1874 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1874 [merge] committer: Ben Howard branch nick: live-build timestamp: Mon 2014-03-31 17:07:45 -0600 message: Mount dev to work with Trusty PPC64EL images diff: === modified file 'scripts/build/lb_chroot_devpts' --- scripts/build/lb_chroot_devpts 2011-11-28 17:56:01 +0000 +++ scripts/build/lb_chroot_devpts 2014-03-31 22:21:42 +0000 @@ -43,6 +43,8 @@ # Creating lock file Create_lockfile .lock + ${LB_ROOT_COMMAND} mount devtmpfs -t devtmpfs chroot/dev + if [ "${LB_USE_FAKEROOT}" != "true" ] then # Creating mountpoint @@ -76,6 +78,8 @@ fi fi + ${LB_ROOT_COMMAND} umount chroot/dev || true + # Removing stage file rm -f .stage/chroot_devpts ;; ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions. + 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: 2014-04-28 07:04:59 +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 ''