UTAH

Merge lp:~nuclearbob/utah/md5-in-latecommand into lp:utah

  1. md5-in-latecommand
  2. Merge into dev
Proposed by Max Brustkern
Status: Merged
Merged at revision: 1007
Proposed branch: lp:~nuclearbob/utah/md5-in-latecommand
Merge into: lp:utah
Diff against target: 25 lines (+3/-1)
2 files modified
templates/utah-latecommand.jinja2 (+1/-0)
utah/provisioning/provisioning.py (+2/-1)
To merge this branch: bzr merge lp:~nuclearbob/utah/md5-in-latecommand
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
Review via email: mp+184821@code.launchpad.net

Description of the change

This change writes the md5sum of the install image to /etc/utah/md5. This will make it easier to get rid of the utah-bootspeed code and replace it with jenkins jobs that use run_utah_tests.py. It could theoretically be useful for other tests as well.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/utah-latecommand.jinja2'
2--- templates/utah-latecommand.jinja2 2013-06-10 04:43:37 +0000
3+++ templates/utah-latecommand.jinja2 2013-09-10 16:30:56 +0000
4@@ -29,6 +29,7 @@
5 echo "{{user}}" >> /target/etc/utah/users
6 echo "{{media_info}}" > /target/etc/utah/media-info
7 echo "{{install_type}}" > /target/etc/utah/install-type
8+ echo "{{md5}}" > /target/etc/utah/md5
9 }
10
11 copy_rsyslog_cfg() {
12
13=== modified file 'utah/provisioning/provisioning.py'
14--- utah/provisioning/provisioning.py 2013-06-25 16:32:47 +0000
15+++ utah/provisioning/provisioning.py 2013-09-10 16:30:56 +0000
16@@ -689,7 +689,8 @@
17 uuid=self.uuid,
18 log_file='/target/var/log/utah-install',
19 media_info=self.image.media_info,
20- install_type=self.image.installtype)
21+ install_type=self.image.installtype,
22+ md5=self.image.getmd5())
23
24 filename = os.path.join(tmpdir, 'initrd.d', 'utah-setup')
25 template.write('utah-setup.jinja2',

Subscribers

People subscribed via source and target branches