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

[Thomi Richards]

Change the tarball root dir and tarball filename.

Change the tarball root dir and tarball filename.

[Francis Ginther (fginther)]

Looks better. thanks.

review: Approve

[Ubuntu CI Bot (uci-bot)]

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

text conflict in core_image_tester/worker.py

[lp:~thomir-deactivatedaccount/core-image-tester/trunk-fix-tarball-root-dir]

27. By Thomi Richards on 2015-04-08

Merged trunk, resolved conflicts.

=== modified file 'core_image_tester/worker.py'
--- core_image_tester/worker.py	2015-04-07 21:06:56 +0000
+++ core_image_tester/worker.py	2015-04-08 00:07:49 +0000
@@ -91,18 +91,16 @@
                     extra=extra
                 )
 
+                container_name = "core-{}-{}-{}".format(
+                    channel,
+                    device,
+                    image_name,
+                ).replace('/', '_')
+                tarball_root = container_name + "-results"
+                tarball_filename = tarball_root + ".tgz"
                 _create_run_metadata_file(result_dir, body)
-
-                tarball_path = tar_directory(
-                    result_dir,
-                    "core-{}".format(image_name)
-                )
+                tarball_path = tar_directory(result_dir, tarball_root)
                 try:
-                    container_name = "core-{}-{}-{}".format(
-                        channel,
-                        device,
-                        image_name,
-                    ).replace('/', '_')
                     logger.info(
                         "Uploading results to swift container '%s'...",
                         container_name,
@@ -110,7 +108,7 @@
                     )
                     success = cloud.upload_to_swift(
                         tarball_path,
-                        'results.tgz',
+                        tarball_filename,
                         container_name,
                         self.config['nova']
                     )