commit e61cbe9123799510fd522ddfa0b78d237da85a35
author Yu-Ju Hong <yjhong@google.com> Tue Jul 10 14:10:26 2012 -0700
committer Gerrit <chrome-bot@google.com> Tue Jul 10 18:47:55 2012 -0700
tree 26da273caafaba31030d42b457dd0d7869fc9853
parent 2f1c41ef7e74d57ab612d936df958db39f3f6447

Support both autotest.tar and autotest.tar.bz2 at Dev server

This change favors the use of autotest.tar if it is available. The script falls
back to using autotest.tar.bz2 in other cases for backward compatibility.

BUG=chromium-os:32312
TEST=unittest & download using local devserver

Change-Id: I6c4590375a814a83a33ec84693e1cb6231752845
Reviewed-on: https://gerrit.chromium.org/gerrit/27076
Commit-Ready: Yu-Ju Hong <yjhong@chromium.org>
Reviewed-by: Yu-Ju Hong <yjhong@chromium.org>
Tested-by: Yu-Ju Hong <yjhong@chromium.org>

devserver_util.py

diff --git a/devserver_util.py b/devserver_util.py
index a4633db..4edfafa 100644
--- a/devserver_util.py
+++ b/devserver_util.py
@@ -59,6 +59,23 @@
   return full_payload_url, nton_payload_url, mton_payload_url
 
 
+def _GetAutotestURL(archive_url):
+  """Find out what type of autotest tarball is available and return the
+  coresponding URL."""
+
+  cmd = 'gsutil ls %s/autotest.*' % archive_url
+  msg = 'Failed to retrieve the list of autotest tarballs.'
+  autotest_tarballs = gsutil_util.GSUtilRun(cmd, msg).splitlines()
+
+  # Use autotest.tar if it is available.
+  for tarball in autotest_tarballs:
+    if os.path.basename(tarball) == downloadable_artifact.AUTOTEST_PACKAGE:
+     return '%s/%s' % (archive_url, downloadable_artifact.AUTOTEST_PACKAGE)
+
+  # Use autotest.tar.bz2 by default for backward compatibility.
+  return '%s/%s' % (archive_url,
+                    downloadable_artifact.AUTOTEST_ZIPPED_PACKAGE)
+
 def GatherArtifactDownloads(main_staging_dir, archive_url, build, build_dir):
   """Generates artifacts that we mean to download and install for autotest.
 
@@ -93,9 +110,10 @@
     artifacts.append(downloadable_artifact.AUTestPayload(
         mton_url, main_staging_dir, mton_payload))
 
+
   # Next we gather the miscellaneous payloads.
+  autotest_url = _GetAutotestURL(archive_url)
   stateful_url = archive_url + '/' + downloadable_artifact.STATEFUL_UPDATE
-  autotest_url = archive_url + '/' + downloadable_artifact.AUTOTEST_PACKAGE
   test_suites_url = (archive_url + '/' +
                      downloadable_artifact.TEST_SUITES_PACKAGE)