Merge lp:~thomir-deactivatedaccount/core-image-tester/trunk-fix-tarball-root-dir into lp:core-image-tester

Proposed by Thomi Richards
Status: Merged
Approved by: Thomi Richards
Approved revision: 27
Merged at revision: 28
Proposed branch: lp:~thomir-deactivatedaccount/core-image-tester/trunk-fix-tarball-root-dir
Merge into: lp:core-image-tester
Diff against target: 39 lines (+9/-11)
1 file modified
core_image_tester/worker.py (+9/-11)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/core-image-tester/trunk-fix-tarball-root-dir
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+255436@code.launchpad.net

Commit message

Change the tarball root dir and tarball filename.

Description of the change

Change the tarball root dir and tarball filename.

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

Looks better. thanks.

review: Approve
Ubuntu CI Bot (uci-bot) wrote :

Attempt to merge into lp:core-image-tester failed due to conflicts:

text conflict in core_image_tester/worker.py

27. By Thomi Richards on 2015-04-08

Merged trunk, resolved conflicts.

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-04-07 21:06:56 +0000
3+++ core_image_tester/worker.py 2015-04-08 00:07:49 +0000
4@@ -91,18 +91,16 @@
5 extra=extra
6 )
7
8+ container_name = "core-{}-{}-{}".format(
9+ channel,
10+ device,
11+ image_name,
12+ ).replace('/', '_')
13+ tarball_root = container_name + "-results"
14+ tarball_filename = tarball_root + ".tgz"
15 _create_run_metadata_file(result_dir, body)
16-
17- tarball_path = tar_directory(
18- result_dir,
19- "core-{}".format(image_name)
20- )
21+ tarball_path = tar_directory(result_dir, tarball_root)
22 try:
23- container_name = "core-{}-{}-{}".format(
24- channel,
25- device,
26- image_name,
27- ).replace('/', '_')
28 logger.info(
29 "Uploading results to swift container '%s'...",
30 container_name,
31@@ -110,7 +108,7 @@
32 )
33 success = cloud.upload_to_swift(
34 tarball_path,
35- 'results.tgz',
36+ tarball_filename,
37 container_name,
38 self.config['nova']
39 )

Subscribers

People subscribed via source and target branches

to all changes: