commit 0e051ddee7a652d1928a87664131b6bfa4330256
author Philipp Wollermann <philwo@google.com> Thu May 16 11:37:52 2019 +0200
committer Philipp Wollermann <philwo@google.com> Thu May 16 11:37:52 2019 +0200
tree 068763358f5030564f4681f3f31d56c3c39885e0
parent 56deefad9da76e895afeb3bdc2cc845493d65a3d

Mount Android SDK and NDK from Cloud Filestore via NFS.

buildkite/bazelci.py

diff --git a/buildkite/bazelci.py b/buildkite/bazelci.py
old mode 100644
new mode 100755
index 56da04d..f7d3ace
--- a/buildkite/bazelci.py
+++ b/buildkite/bazelci.py
@@ -1509,7 +1509,7 @@
 
 
 def create_docker_step(label, image, commands=None, additional_env_vars=None):
-    env = ["BUILDKITE_ARTIFACT_UPLOAD_DESTINATION"]
+    env = ["ANDROID_HOME", "ANDROID_NDK_HOME", "BUILDKITE_ARTIFACT_UPLOAD_DESTINATION"]
     if additional_env_vars:
         env += ["{}={}".format(k, v) for k, v in additional_env_vars.items()]
 
@@ -1529,6 +1529,7 @@
                 "volumes": [
                     ".:/workdir",
                     "/var/lib/docker/bazel-cache:/home/bazel/.cache/bazel/_bazel_bazel/cache",
+                    "{0}:{0}:ro".format("/opt"),
                     "{0}:{0}".format("/var/lib/bazelbuild"),
                     "{0}:{0}".format("/var/run/docker.sock"),
                 ],