Merge lp:~fginther/core-image-tester/edge-support into lp:core-image-tester

[Francis Ginther]

Add support for 'release'.

Add support for 'release'.

[Celso Providelo (cprov)]

Francis,

As discussed on IRC, if we hardcode configuration channel as "ubuntu-core/rolling/edge" in the deployer, this change wouldn't be necessary.

review: Needs Information

[Francis Ginther (fginther)]

Rejecting as a different solution was implemented that only required modifications to the publisher.

Unmerged revisions

32. By Francis Ginther on 2015-04-22

Add support for 'release'.

=== modified file 'core_image_tester/worker.py'
--- core_image_tester/worker.py	2015-04-17 16:02:30 +0000
+++ core_image_tester/worker.py	2015-04-22 19:42:01 +0000
@@ -56,6 +56,7 @@
             nova_image_id = body['nova_image_id']
             image_name = body['image_name']
             device = body['device']
+            release = body['release']
             channel = body['channel']
         except KeyError as e:
             logger.error("Message does not contain required ", extra=extra)
@@ -97,7 +98,8 @@
                     extra=extra
                 )
 
-                container_name = "core-{}-{}-{}".format(
+                container_name = "core-{}-{}-{}-{}".format(
+                    release,
                     channel,
                     device,
                     image_name,
@@ -146,6 +148,7 @@
 
     """
     key_whitelist = [
+        'release',
         'channel',
         'device',
         'test_branch',