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

Proposed by Joe Talbott
Status: Merged
Merged at revision: 37
Proposed branch: lp:~joetalbott/core-image-tester/fix_names
Merge into: lp:core-image-tester
Diff against target: 38 lines (+5/-2)
1 file modified
core_image_tester/worker.py (+5/-2)
To merge this branch: bzr merge lp:~joetalbott/core-image-tester/fix_names
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+262634@code.launchpad.net

Commit message

Add release to container name and metadata file whitelist.

Description of the change

Add release to container name and metadata file whitelist.

To post a comment you must log in.
Francis Ginther (fginther) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'core_image_tester/worker.py'
2--- core_image_tester/worker.py 2015-05-08 05:05:23 +0000
3+++ core_image_tester/worker.py 2015-06-22 21:38:34 +0000
4@@ -58,6 +58,7 @@
5 image_name = body['image_name']
6 device = body['device']
7 channel = body['channel']
8+ release = body['release']
9 except KeyError as e:
10 logger.error("Message does not contain required ", extra=extra)
11 return MessageActions.Retry
12@@ -98,7 +99,8 @@
13 extra=extra
14 )
15
16- container_name = "core-{}-{}-{}".format(
17+ container_name = "core-{}-{}-{}-{}".format(
18+ release,
19 channel,
20 device,
21 image_name,
22@@ -139,7 +141,7 @@
23
24
25 def _create_run_metadata_file(directory, request):
26- """Create a metadata file in 'directory' with some of the data from 'request'
27+ """Create a metadata file in 'directory' with some data from 'request'
28
29 We want to make sure that, as (potentially confidential) items are added to
30 the request that we don't blindly add them to the metadata file, so we
31@@ -147,6 +149,7 @@
32
33 """
34 key_whitelist = [
35+ 'release',
36 'channel',
37 'device',
38 'test_branch',

Subscribers

People subscribed via source and target branches