Closed Bug 552680 Opened 10 years ago Closed 10 years ago

Add android toolchain to puppet manifests

Categories

(Release Engineering :: General, defect)

x86
Android
defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: joduinn, Assigned: bear)

References

Details

(Whiteboard: [android][puppet])

Attachments

(1 file, 6 obsolete files)

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.
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
Attached patch [WIP] android sdk and ndk (obsolete) — Splinter Review
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
Attachment #435101 - Flags: feedback?(bhearsum)
Whiteboard: [android][puppet]
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.
Attachment #435101 - Flags: feedback?(bhearsum) → feedback-
Attached patch [WIP] android sdk and ndk (obsolete) — Splinter Review
adjusted patch to latest changes and also added file section as requested
Attachment #435101 - Attachment is obsolete: true
Attachment #435667 - Flags: feedback?(bhearsum)
Attachment #435667 - Flags: feedback?(bhearsum) → feedback-
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
Status: NEW → ASSIGNED
removed extra dir levels to symlink file{} item (errant cut-n-paste sloppiness)
Attachment #435667 - Attachment is obsolete: true
Attachment #437036 - Flags: review?(bhearsum)
Attachment #437036 - Flags: review?(bhearsum) → review+
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!
Attachment #437036 - Flags: checked-in?
Attachment #437036 - Attachment is obsolete: true
Attachment #440533 - Flags: review?(bhearsum)
Attachment #437036 - Flags: checked-in?
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
Attachment #440533 - Attachment is obsolete: true
Attachment #441185 - Flags: review?
Attachment #440533 - Flags: review?(bhearsum)
Attachment #441185 - Flags: review? → review?(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.
Attachment #441185 - Attachment is obsolete: true
Attachment #441194 - Flags: review?(bhearsum)
Attachment #441185 - Flags: review?(bhearsum)
helps if you change all sdk-r5 references to sdk-r7
Attachment #441194 - Attachment is obsolete: true
Attachment #441196 - Flags: review?(bhearsum)
Attachment #441194 - Flags: review?(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.
Attachment #441196 - Flags: review?(bhearsum) → review+
Depends on: 555794
Comment on attachment 441196 [details] [diff] [review]
add android sdk and ndk and also java 6 to the devtools class

changeset:   131:e6331b115fac
Attachment #441196 - Flags: checked-in+
OS: Mac OS X → Android
No longer depends on: 555794
tested puppet update on moz2-linux-slave10 and sdk/ndk landed cleanly. 

doing a test build now to ensure toolchain is functional.
test build is fine and also another sampling of 5 slaves - closing.
Status: ASSIGNED → RESOLVED
Closed: 10 years ago
Resolution: --- → FIXED
Hm, did staging get updated?
I tried to force moz2-linux-slave03 unsuccessfully.
bhearsum reports that the staging environment will land once he is done with some local testing
> 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.
yea, I was researching that also when I got distracted by other things.

it's a mistake on my part
Product: mozilla.org → Release Engineering
You need to log in before you can comment on or make changes to this bug.