Merge lp:~joetalbott/ci-core-jenkins/fix_names into lp:ci-core-jenkins

[Joe Talbott]

Make container and result file names match what lp:autopkgtest-result-checker produces.

Make container and result file names match what lp:autopkgtest-result-checker produces.

[Para Siva (psivaa)]

Seems ok to me, not being able to test this though.

review: Approve

[Para Siva (psivaa)]

This also needs the AUTH url change in the config file. I already had an MP for this in-progress for the channel, release name fixes to land. https://code.launchpad.net/~psivaa/ci-core-jenkins/ps4.5-auth-url/+merge/261357

[Francis Ginther (fginther)]

Argh, I missed this in my earlier review, there is no "args.release" being parsed. I'm not opposed to setting this with a default value of "rolling" and limiting the amount of code changes.

review: Needs Fixing

[lp:~joetalbott/ci-core-jenkins/fix_names]

17. By Joe Talbott on 2015-06-23

Hardcode "rolling" for the release for now.

[Francis Ginther (fginther)]

should be good to go, thanks

review: Approve

=== modified file 'workers/fetch_latest_results/__init__.py'
--- workers/fetch_latest_results/__init__.py	2015-06-04 15:15:57 +0000
+++ workers/fetch_latest_results/__init__.py	2015-06-23 18:17:19 +0000
@@ -31,7 +31,7 @@
 logger = logging.getLogger(__name__)
 
 RESULT_FILE = os.path.join(os.path.dirname(__file__),
-                           '../../ubuntu-core_{}-{}-{}-results.tgz')
+                           '../../{}-results.tgz')
 DESTINATION_RESULT_DIR = os.path.join(os.path.dirname(__file__),
                                       '../../results')
 
@@ -97,13 +97,14 @@
     result_url = config.get(args.channel, 'result_url')
     retry_count = int(config.get(args.channel, 'retry_count'))
 
-    url = "{0}/core-ubuntu-core_{1}-{2}-{3}/"\
-          "core-ubuntu-core_{1}-{2}-{3}-results.tgz"
-    url = url.format(result_url,
-                     args.channel,
-                     args.device,
-                     args.image_id)
-    result_file = RESULT_FILE.format(args.channel, args.device, args.image_id)
+    container_name = "core-{}-{}-{}-{}".format(
+        'rolling',
+        args.channel,
+        args.device,
+        args.image_id)
+    url = "{0}/{1}/{1}-results.tgz"
+    url = url.format(result_url, container_name)
+    result_file = RESULT_FILE.format(container_name)
     _clean_old_results()
 
     count = 0