Merge lp:~cprov/snappy-proposed-image-builder/release-payload into lp:snappy-proposed-image-builder

[Celso Providelo]

Replace hardcoded 'release' and 'channel' value by their corresponding payload values (set by the agent).

Replace hardcoded 'release' and 'channel' value by their corresponding payload values (set by the agent).

[Joe Talbott (joetalbott)]

Looks good, thanks for doing this work.

review: Approve

=== modified file 'snappy_proposed_image_builder/worker.py'
--- snappy_proposed_image_builder/worker.py	2015-05-29 19:23:55 +0000
+++ snappy_proposed_image_builder/worker.py	2015-05-29 19:41:59 +0000
@@ -69,6 +69,7 @@
             try:
                 rootfs_path = download_rootfs(
                     image_name,
+                    release,
                     channel,
                     device,
                     tmpdir
@@ -123,6 +124,7 @@
                 image_path = build_image(
                     image_name,
                     new_rootfs_path,
+                    release,
                     channel,
                     device,
                     tmpdir
@@ -168,24 +170,22 @@
         return MessageActions.Acknowledge
 
 
-def download_rootfs(name, channel, device, tmpdir):
+def download_rootfs(name, release, channel, device, tmpdir):
     """Download the ubuntu code image, return a path to it on disk."""
     image_path = os.path.join(tmpdir, 'snappy-proposed-{}.img'.format(name))
 
-    # The following uses hardcoded parameters for '--channel' and 'release'.
-    # It is ignoring the channel value passed in.
     cmd = ['sudo',
            './ubuntu-device-flash',
            '--revision', name,
            '--download-only',
            'core',
            '--device', device,
-           '--channel', 'edge',
+           '--channel', channel,
            '--size', '3',
            '-o', image_path,
            '--developer-mode',
            '--cloud',
-           'rolling']
+           release]
     check_call(cmd)
 
     cmd = ['sudo',
@@ -327,23 +327,21 @@
     return new_rootfs_path
 
 
-def build_image(name, rootfs_path, channel, device, tmpdir):
+def build_image(name, rootfs_path, release, channel, device, tmpdir):
     """Download the ubuntu code image, return a path to it on disk."""
     image_path = os.path.join(tmpdir, 'snappy-proposed-{}.img'.format(name))
-    # The following uses hardcoded parameters for '--channel' and 'release'.
-    # It is ignoring the channel value passed in.
     cmd = ['sudo',
            './ubuntu-device-flash',
            '--revision', name,
            'core',
            '--device', device,
-           '--channel', 'edge',
+           '--channel', channel,
            '--size', '3',
            '--image-part', rootfs_path,
            '-o', image_path,
            '--developer-mode',
            '--cloud',
-           'rolling']
+           release]
     check_call(cmd)
 
     cmd = ['sudo',
@@ -367,6 +365,7 @@
            image_path,
            converted_image_path]
     check_call(cmd)
+
     return converted_image_path