Merge lp:~joetalbott/core-image-tester/fix_names into lp:core-image-tester

[Joe Talbott]

Add release to container name and metadata file whitelist.

Add release to container name and metadata file whitelist.

[Francis Ginther (fginther)]

Looks good.

review: Approve

=== modified file 'core_image_tester/worker.py'
--- core_image_tester/worker.py	2015-05-08 05:05:23 +0000
+++ core_image_tester/worker.py	2015-06-22 21:38:34 +0000
@@ -58,6 +58,7 @@
             image_name = body['image_name']
             device = body['device']
             channel = body['channel']
+            release = body['release']
         except KeyError as e:
             logger.error("Message does not contain required ", extra=extra)
             return MessageActions.Retry
@@ -98,7 +99,8 @@
                     extra=extra
                 )
 
-                container_name = "core-{}-{}-{}".format(
+                container_name = "core-{}-{}-{}-{}".format(
+                    release,
                     channel,
                     device,
                     image_name,
@@ -139,7 +141,7 @@
 
 
 def _create_run_metadata_file(directory, request):
-    """Create a metadata file in 'directory' with some of the data from 'request'
+    """Create a metadata file in 'directory' with some data from 'request'
 
     We want to make sure that, as (potentially confidential) items are added to
     the request that we don't blindly add them to the metadata file, so we
@@ -147,6 +149,7 @@
 
     """
     key_whitelist = [
+        'release',
         'channel',
         'device',
         'test_branch',