Skip to content

Commit

Permalink
[build] Install Linux Android stuff to /mnt not /home (#3125)
Browse files Browse the repository at this point in the history
`/mnt/scratch` is 100G, vs 30G for `/`.

We should run out of disk less often now.
  • Loading branch information
directhex authored and jonpryor committed May 29, 2019
1 parent 4118485 commit 4e6383d
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions build-tools/automation/build.linux.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@ timestamps {
echo "Build type: ${buildType}"
echo "Stable build workflow: ${isStable}"

pBuilderBindMounts = "/home/${env.USER}"
pBuilderBindMounts = "/mnt/scratch"
echo "pBuilderBindMounts: ${pBuilderBindMounts}"

echo "chRootPackages: ${chRootPackages}"

if (env.AdditionalPackages) {
Expand Down Expand Up @@ -103,6 +102,9 @@ timestamps {
utils.stageWithTimeout('build and package', 7, 'HOURS', XADir, true) { // Typically takes 4-5 hours
execChRootCommand(env.ChRootName, chRootPackages, pBuilderBindMounts,
"""
export AndroidToolchainDirectory=/mnt/scratch/android-toolchain
export AndroidToolchainCacheDirectory=/mnt/scratch/android-archives
if [ -z "\$JAVA_HOME" ]; then
if [ -f /etc/profile.d/jdk.sh ]; then
echo 'STAGE: jdk'
Expand Down Expand Up @@ -163,6 +165,9 @@ timestamps {

execChRootCommand(env.ChRootName, chRootPackages, pBuilderBindMounts,
"""
export AndroidToolchainDirectory=/mnt/scratch/android-toolchain
export AndroidToolchainCacheDirectory=/mnt/scratch/android-archives
echo "STAGE: run all tests"
xvfb-run -a -- make run-all-tests CONFIGURATION=${env.BuildFlavor} V=1 || (killall adb && false)
killall adb || true
Expand Down

0 comments on commit 4e6383d

Please sign in to comment.