Revert "buildbot: switch buildbot & cros_sdk to xz"
This CL uploads a bzip2 compressed tarball with an xz extension.
Oops! Revert, so the CL can be fixed and resubmitted.
BUG=chromium-os:19287
TEST=unittests
Change-Id: I3c37751242d58e6db6b08d0c22d406151f3a060d
Reviewed-on: https://gerrit.chromium.org/gerrit/34821
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
Tested-by: David James <davidjames@chromium.org>
diff --git a/scripts/upload_prebuilts.py b/scripts/upload_prebuilts.py
index c6041de..08d578e 100644
--- a/scripts/upload_prebuilts.py
+++ b/scripts/upload_prebuilts.py
@@ -410,7 +410,8 @@
cmd = ['tar', '-I', bzip2, '-cf', tarfile]
excluded_paths = ('usr/lib/debug', 'usr/local/autotest', 'packages',
'tmp')
- cmd.extend('--exclude=%s/*' % path for path in excluded_paths)
+ for path in excluded_paths:
+ cmd.append('--exclude=%s/*' % path)
cmd.append('.')
cros_build_lib.SudoRunCommand(cmd, cwd=os.path.join(cwd, boardname))
else:
@@ -425,7 +426,7 @@
# FIXME(zbehan): Why does version contain the prefix "chroot-"?
version_str = version[len('chroot-'):]
remote_tarfile = \
- '%s/cros-sdk-%s.tar.xz' % (_SDK_GS_BUCKET, version_str)
+ '%s/cros-sdk-%s.tbz2' % (_SDK_GS_BUCKET, version_str)
# For SDK, also upload the manifest which is guaranteed to exist
# by the builderstage.
_GsUpload(tarfile + '.Manifest', remote_tarfile + '.Manifest',
@@ -438,6 +439,7 @@
_GsUpload(pointerfile, remote_pointerfile, self._acl)
_GsUpload(tarfile, remote_tarfile, self._acl)
+
def _GetTargets(self):
"""Retuns the list of targets to use."""
targets = self._slave_targets[:]