Merge lp:~fginther/core-image-publisher/hardcoded-edge-rolling into lp:core-image-publisher

[Francis Ginther]

Hardcode core image download to edge and rolling, ignoring the passed in channel.

This also uses a different approach for getting rid of the .gnupg dir owned by root as suggested here:
https://code.launchpad.net/~fginther/core-image-publisher/edge-support/+merge/257165

Hardcode core image download to edge and rolling, ignoring the passed in channel.

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

[Celso Providelo (cprov)]

review: Approve

[lp:~fginther/core-image-publisher/hardcoded-edge-rolling]

29. By Francis Ginther on 2015-04-23

Remove import getpass as it's not needed anymore.

=== modified file 'core_image_publisher/worker.py'
--- core_image_publisher/worker.py	2015-04-08 20:14:12 +0000
+++ core_image_publisher/worker.py	2015-04-23 01:33:19 +0000
@@ -115,16 +115,24 @@
         # worker and perform testing retries.
         'HOME': tmpdir,
     }
+    # The folling 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', channel,
+           '--channel', 'edge',
            '--size', '3',
            '-o', image_path,
            '--developer-mode',
-           '--cloud']
+           '--cloud',
+           'rolling']
+    check_call(cmd, env=udf_env)
+    cmd = ['sudo',
+           'rm',
+           '-rf',
+           os.path.join(tmpdir, '.gnupg')]
     check_call(cmd, env=udf_env)
     return image_path