Replace autotest.tar.bz2 with autotest.tar at Dev server
This change replaces autotest.tar.bz2 with autotest.tar.
BUG=chromium-os:32312
TEST=unittest
CQ-DEPEND=I1cd0e3c029cfd0a9fa27f981b68ba2958c94dec1
Change-Id: I2bd02e1d538181a75a1545bd90ae0465bc75de4e
Reviewed-on: https://gerrit.chromium.org/gerrit/26634
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Yu-Ju Hong <yjhong@chromium.org>
Commit-Ready: Yu-Ju Hong <yjhong@chromium.org>
diff --git a/downloadable_artifact.py b/downloadable_artifact.py
index bf16885..1936e2b 100644
--- a/downloadable_artifact.py
+++ b/downloadable_artifact.py
@@ -17,7 +17,7 @@
STATEFUL_UPDATE = 'stateful.tgz'
TEST_IMAGE = 'chromiumos_test_image.bin'
ROOT_UPDATE = 'update.gz'
-AUTOTEST_PACKAGE = 'autotest.tar.bz2'
+AUTOTEST_PACKAGE = 'autotest.tar'
TEST_SUITES_PACKAGE = 'test_suites.tar.bz2'
@@ -109,6 +109,17 @@
class AutotestTarball(Tarball):
"""Wrapper around the autotest tarball to download from gsutil."""
+ def _ExtractTarball(self, exclude=None):
+ """Extracts the tarball into the install_path with optional exclude path."""
+ exclude_str = '--exclude=%s' % exclude if exclude else ''
+ cmd = 'tar xf %s %s --directory=%s' % (
+ self._tmp_stage_path, exclude_str, self._install_path)
+ msg = 'An error occurred when attempting to untar %s' % self._tmp_stage_path
+ try:
+ subprocess.check_call(cmd, shell=True)
+ except subprocess.CalledProcessError, e:
+ raise ArtifactDownloadError('%s %s' % (msg, e))
+
def Stage(self):
"""Untars the autotest tarball into the install path excluding test suites.
"""