552680 - Add android toolchain to puppet manifests

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

We expect to be running android builds on our existing linux VMs. Once we get this working manually on an experimental VM, we will need to create puppet manifests to deploy the android toolchain to all our production linux builders.

Comment 1

[Mike Taylor [:bear]]

installed latest:

- sdk /tools/android-sdk -> android-sdk-linux_86-r5
- ndk /tools/android-ndk -> android-ndk-r3
- the Sun JDK was already installed and was active
- added to .bash_profile /tools/jdk/bin to PATH

sanity build worked and installed on my nexus one

Comment 2

[Mike Taylor [:bear]]

Attachment: [WIP] android sdk and ndk

not sure how to handle the Java6 jdk requirement.  need to figure out how to optionally install Java6 if the platform is Android *and* also the Java6 jdk filename seems to be different than the pattern the Java5 sdk is

Comment 3

[[e-mail] (:bhearsum)]

Comment on attachment 435101 [details] [diff] [review]
[WIP] android sdk and ndk

This won't quite work; it'll fail on x86_64 because the android dirs won't exist. You'll need to add a file {} check inside the 'default' case, so it only applies to 32-bit slaves.

Comment 4

[Mike Taylor [:bear]]

Attachment: [WIP] android sdk and ndk

adjusted patch to latest changes and also added file section as requested

Comment 5

[[e-mail] (:bhearsum)]

Comment on attachment 435667 [details] [diff] [review]
[WIP] android sdk and ndk

I dunno if this patch is still current, but one thing than needs to be fixed is the symlinks. They should be pointing to directories, not files. Eg, how /tools/jdk points to /tools/jdk-1.5.0._10

Comment 6

[Mike Taylor [:bear]]

Attachment: add android sdk and ndk and also java 6 to the devtools class

removed extra dir levels to symlink file{} item (errant cut-n-paste sloppiness)

Comment 7

[[e-mail] (:bhearsum)]

Comment on attachment 437036 [details] [diff] [review]
add android sdk and ndk and also java 6 to the devtools class

This seems good to me!

Comment 8

[Mike Taylor [:bear]]

Attachment: add android sdk and ndk and also java 6 to the devtools class

Comment 9

[Mike Taylor [:bear]]

Attachment: add android sdk and ndk and also java 6 to the devtools class

tested on staging puppet against linux-slave17.

the android-sdk-r7.tgz tarball will need to be saved as I had to rebuild it to fix the directory name

Comment 10

[Mike Taylor [:bear]]

Attachment: add android sdk and ndk and also java 6 to the devtools class

as I was going back over my notes I realized I had the version number wrong for the android sdk - it should be r7 and not r5.  patch adjusted and also renamed the tarball.

Comment 11

[Mike Taylor [:bear]]

Attachment: add android sdk and ndk and also java 6 to the devtools class

helps if you change all sdk-r5 references to sdk-r7

Comment 12

[[e-mail] (:bhearsum)]

Comment on attachment 441196 [details] [diff] [review]
add android sdk and ndk and also java 6 to the devtools class

We should wait until the bandwidth between Castro and MPT is upgraded before deploying this.

Comment 13

[[e-mail] (:bhearsum)]

Comment on attachment 441196 [details] [diff] [review]
add android sdk and ndk and also java 6 to the devtools class

changeset:   131:e6331b115fac

Comment 14

[Mike Taylor [:bear]]

tested puppet update on moz2-linux-slave10 and sdk/ndk landed cleanly. 

doing a test build now to ensure toolchain is functional.

Comment 15

[Mike Taylor [:bear]]

test build is fine and also another sampling of 5 slaves - closing.

Comment 16

[Aki Sasaki [:aki] (he/him) (UTC-7)]

Hm, did staging get updated?
I tried to force moz2-linux-slave03 unsuccessfully.

Comment 17

[Mike Taylor [:bear]]

bhearsum reports that the staging environment will land once he is done with some local testing

Comment 18

[[e-mail] (:bhearsum)]

> as I was going back over my notes I realized I had the version number wrong for
> the android sdk - it should be r7 and not r5.  patch adjusted and also renamed
> the tarball.

Are you sure this version change is right? I can't find an Android SDK r7 *anywhere* on the Internet.

Comment 19

[Mike Taylor [:bear]]

yea, I was researching that also when I got distracted by other things.

it's a mistake on my part