1137940 - Deploy Android sdk r18 to tooltool

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Geoff Brown [:gbrown]]

+++ This bug was initially created as a clone of Bug #1137513 +++

Our existing Android-x86 4.2 and Android-armv7 2.3 test environments use the emulator from /tools/android-sdk18, which we last modified in bug 933918, with a special patched emulator based on Android SDK Tools 22.0.5.

It seems to me (please check my work!) that /tools/android-sdk18 is populated from http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/a/android-sdk18/android-sdk18_0.r18moz1-0moz1_amd64.deb, which has very similar content to http://puppetagain.pub.build.mozilla.org/data/repos/apt/releng/pool/main/a/android-sdk18/android-sdk18_0.r18moz1.orig.tar.bz2.

To eliminate the puppetagin archive, we need the same content in a compressed tar file uploaded to tooltool. (The .tgz format used in bug 1137513 is great; anything that tooltool.py knows how to unpack is fine.)

I am tempted to use android-sdk18_0.r18moz1.orig.tar.bz2, but I would prefer to have a different top level directory. Rather than the existing orig-source/amd64/sdk, I would prefer something like android-sdk18: Can we unpack android-sdk18_0.r18moz1.orig.tar.bz2, mv orig-source/amd64/sdk android-sdk18, and then repack? For example, I'd like to see "android-sdk18/extras/android/support/NOTICE.txt" in the new archive.

Comment 1

[Dustin J. Mitchell [:dustin] (he/him)]

If at *all* possible, we should go back to the original sources for this data, rather than re-doing a tarball that was hand-created in a manner that is anyway lost to time.

At any rate, I'm more than happy to do the upload, but getting the content right is a little out of my scope and I suspect that iterating on it via bug comments will be slow.  If you can cook up something your happy with (preferably along with a description of its derivation, for use by people who can't download the original and for reference if/when we want to replace it) and put it somewhere reasonably non-public that I can find it, that would be great.  If the derivation description is a shell script then I'm happy to just run it myself.

Comment 2

[Dustin J. Mitchell [:dustin] (he/him)]

Actually, not lost to the sands of time -- at https://github.com/mozilla/build-puppet/tree/master/modules/packages/manifests/android-sdk18-debian

Comment 3

[Geoff Brown [:gbrown]]

https://github.com/mozilla/build-puppet/tree/master/modules/packages/manifests/android-sdk18-debian looks perfectly valid still -- I can re-create android-sdk18_0.r18moz1.orig.tar.bz2 with "make orig-source" against that rules file.

To incorporate my requests for format change, we can just change:

22a23
> NEW_TARGET_DIR = android-sdk18
52a54,56
> 	mv $(TARGET_DIR)/amd64/sdk $(NEW_TARGET_DIR)
> 	tar czf $(PKG_NAME)_$(VERSION).orig.tar.gz $(NEW_TARGET_DIR)
> 	rm -rf $(NEW_TARGET_DIR)

eg.

get-orig-source: adt-bundle-linux-x86-$(BUNDLE_VER).zip adt-bundle-linux-x86_64-$(BUNDLE_VER).zip $(PATCHED_TOOLS)
	rm -rf $(TARGET_DIR)
	unzip -q adt-bundle-linux-x86_64-$(BUNDLE_VER).zip -d $(TARGET_DIR)
	mv $(TARGET_DIR)/adt-bundle-linux-x86_64-$(BUNDLE_VER) $(TARGET_DIR)/amd64
	tar zxf $(PATCHED_TOOLS) -C $(TARGET_DIR)/amd64/sdk/tools
	rm -rf $(foreach dir,$(EXCLUDES),$(TARGET_DIR)/*/$(dir))
	chmod -R a+rX $(TARGET_DIR)
	tar cjf $(PKG_NAME)_$(VERSION).orig.tar.bz2 $(TARGET_DIR)
	mv $(TARGET_DIR)/amd64/sdk $(NEW_TARGET_DIR)
	tar czf $(PKG_NAME)_$(VERSION).orig.tar.gz $(NEW_TARGET_DIR)
	rm -rf $(NEW_TARGET_DIR)
	rm -rf $(TARGET_DIR)

Comment 4

[Dustin J. Mitchell [:dustin] (he/him)]

OK, I can run that.  Your patched version creates two tarballs, though -- you only want the second (the tar.gz) right?

Comment 5

[Geoff Brown [:gbrown]]

That's right -- I just need the .tar.gz on tooltool.

Thanks!

Comment 6

[Dustin J. Mitchell [:dustin] (he/him)]

Attachment: Makefile

Here's the Makefile I used.

Comment 7

[Dustin J. Mitchell [:dustin] (he/him)]

[
{
"size": 193383673,
"digest": "6609e8b95db59c6a3ad60fc3dcfc358b2c8ec8b4dda4c2780eb439e1c5dcc5d550f2e47ce56ba14309363070078d09b5287e372f6e95686110ff8a2ef1838221",
"algorithm": "sha512",
"filename": "android-sdk18_0.r18moz1.orig.tar.gz"
}
]

woo!