Upload extracted maven directory when archiving
This allows us to point android studio at an unrelease d8 for
testing/debugging.
Change-Id: Id3da3674fef5f0416a9dd466248c1b2928413c71
diff --git a/tools/archive.py b/tools/archive.py
index 360a0ee..815e416 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -113,6 +113,14 @@
print('Uploading %s to %s' % (tagged_jar, destination))
utils.upload_file_to_cloud_storage(tagged_jar, destination)
print('File available at: %s' % GetUrl(version, file_name, is_master))
+ # Upload extracted maven directory for easy testing in studio.
+ zip_ref = zipfile.ZipFile(utils.MAVEN_ZIP, 'r')
+ zip_ref.extractall(temp)
+ zip_ref.close()
+ utils.upload_dir_to_cloud_storage(
+ os.path.join(temp, 'com'),
+ GetUploadDestination(version, 'com', is_master))
+ print('Maven repo root available at: %s' % GetUrl(version, '', is_master))
if __name__ == '__main__':
sys.exit(Main())
diff --git a/tools/test.py b/tools/test.py
index 58fc4eb..ed99c1d 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -85,7 +85,7 @@
upload_dir = os.path.join(utils.REPO_ROOT, 'build', 'reports', 'tests')
u_dir = uuid.uuid4()
destination = 'gs://%s/%s' % (BUCKET, u_dir)
- utils.upload_dir_to_cloud_storage(upload_dir, destination)
+ utils.upload_dir_to_cloud_storage(upload_dir, destination, is_html=True)
url = 'http://storage.googleapis.com/%s/%s/test/index.html' % (BUCKET, u_dir)
print 'Test results available at: %s' % url
print '@@@STEP_LINK@Test failures@%s@@@' % url
@@ -166,4 +166,3 @@
else:
notify.notify("Tests passed.")
sys.exit(return_code)
-
diff --git a/tools/utils.py b/tools/utils.py
index 47acca5..8716f65 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -73,10 +73,12 @@
if not os.path.isdir(path):
raise
-def upload_dir_to_cloud_storage(directory, destination):
+def upload_dir_to_cloud_storage(directory, destination, is_html=False):
# Upload and make the content encoding right for viewing directly
- cmd = ['gsutil.py', 'cp', '-z', 'html', '-a',
- 'public-read', '-R', directory, destination]
+ cmd = ['gsutil.py', 'cp']
+ if is_html:
+ cmd += ['-z', 'html']
+ cmd += ['-a', 'public-read', '-R', directory, destination]
PrintCmd(cmd)
subprocess.check_call(cmd)
