+ 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: francis.ginther@canonical.com-20180629210857-i9uyreqsrgna3yo9
date: 2018-06-29 16:08:57 -0500
build-date: 2019-01-22 14:52:00 +0000
revno: 736
branch-nick: automated-ec2-builds
+ bzr log -p -r-1
------------------------------------------------------------
revno: 736 [merge]
committer: Francis Ginther <francis.ginther@canonical.com>
branch nick: trunk
timestamp: Fri 2018-06-29 16:08:57 -0500
message:
  remove-old-dailies: Clean up cosmic
  [a=fginther][r=rcj,philroche]
  
  MP: https://code.launchpad.net/~ubuntu-on-ec2/vmbuilder/automated-ec2-builds-fginther/+merge/348683
diff:
=== modified file 'remove-old-dailies'
--- remove-old-dailies	2018-03-26 15:12:08 +0000
+++ remove-old-dailies	2018-06-28 13:47:28 +0000
@@ -7,7 +7,7 @@
 SAFE_FILE=.save
 
 BASES=( /srv/ec2-images/server )
-RELS="trusty xenial zesty artful bionic"
+RELS="trusty xenial artful bionic cosmic"
 
 # 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: phil.roche@canonical.com-20190116185417-rveqcd1j1lxql1p0
date: 2019-01-16 18:54:17 +0000
build-date: 2019-01-22 14:52:00 +0000
revno: 666
branch-nick: ec2-publishing-scripts
+ bzr log -p -r-1
------------------------------------------------------------
revno: 666 [merge]
committer: Phil Roche <phil.roche@canonical.com>
branch nick: ec2-publishing-scripts
timestamp: Wed 2019-01-16 18:54:17 +0000
message:
  Merge lp:~philroche/ubuntu-on-ec2/ec2-publishing-scripts-querydata-arch into lp:~ubuntu-on-ec2/ubuntu-on-ec2/ec2-publishing-scripts [a=philroche] [r=daniel-thewatkins,rcj]
  
  Bugfix: Update querydata merge code to include arch in query data output filenames 
  
  This was added in aws publication code in awslib, which is called by cloud-image-manager, 
  to enable multiple different architectures to output query data, which will be merged 
  together later, but in this instance we are only interested in amd64 (hvm is amd64 only) 
  so we can hardcode the arch to amd64.
  
  MP: https://code.launchpad.net/~philroche/ubuntu-on-ec2/ec2-publishing-scripts-querydata-arch/+merge/361829
diff:
=== modified file 'ec2-image2ebs'
--- ec2-image2ebs	2017-12-08 19:44:46 +0000
+++ ec2-image2ebs	2019-01-16 14:38:34 +0000
@@ -644,9 +644,9 @@
 	mkdir -p "${query_data_directory}"
 
 	if [ ${RELEASE_LABEL} = 'release' ]; then
-		query_data_file=${query_data_directory}/released.txt
+		query_data_file=${query_data_directory}/${arch}.released.txt
 	else
-		query_data_file=${query_data_directory}/${RELEASE_LABEL}.txt
+		query_data_file=${query_data_directory}/${arch}.${RELEASE_LABEL}.txt
 	fi
 
 	debug 1  "Running cloud-image-manager register_image_from_snapshot ..."

=== modified file 'publish-hvm-image'
--- publish-hvm-image	2017-12-08 17:30:52 +0000
+++ publish-hvm-image	2019-01-16 14:49:56 +0000
@@ -428,9 +428,9 @@
 		mkdir -p "${query_data_directory}"
 
 		if [ ${RELEASE_LABEL} = 'release' ]; then
-			query_data_file=${query_data_directory}/released.txt
+			query_data_file=${query_data_directory}/${arch}.released.txt
 		else
-			query_data_file=${query_data_directory}/${RELEASE_LABEL}.txt
+			query_data_file=${query_data_directory}/${arch}.${RELEASE_LABEL}.txt
 		fi
 
 		# As we are registering an image of virtualization type hvm
------------------------------------------------------------
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: 2019-01-22 14:52:01 +0000
revno: 1884
branch-nick: live-build
+ bzr log -p -r-1
------------------------------------------------------------
revno: 1884
committer: Ben Howard <ben.howard@canonical.com>
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: 2019-01-22 14:52:01 +0000
revno: 398
branch-nick: vmbuilder-0.11
+ bzr log -p -r-1
------------------------------------------------------------
revno: 398
committer: Ben Howard <ben.howard@canonical.com>
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 ''