commit 9425801d1ee3fede78042fe8f207a709c4f93666
author Greg Hartman <ghartman@google.com> Thu Mar 21 20:36:12 2019 -0700
committer Greg Hartman <ghartman@google.com> Sat Mar 23 00:26:12 2019 +0000
tree 004287d61d08006328412c52570e1785f1c73f27
parent 9103a8095f93c0b5389898d13eebe6018c34fcdc

Add the ability to initiate host image builds on GCE

Test: Ran on GCE, got a host image
Change-Id: I1951a8953571d2f21d5ecf6e5e8a871dfca6a5af

tools/create_base_image_hostlib.sh

diff --git a/tools/create_base_image_hostlib.sh b/tools/create_base_image_hostlib.sh
index d4f343f..abc2fd8 100755
--- a/tools/create_base_image_hostlib.sh
+++ b/tools/create_base_image_hostlib.sh
@@ -5,6 +5,9 @@
 # INTERNAL_extra_source may be set to a directory containing the source for
 # extra package to build.
 
+# INTERNAL_IP can be set to --internal-ip run on a GCE instance
+# The instance will need --scope compute-rw
+
 source "${ANDROID_BUILD_TOP}/external/shflags/src/shflags"
 
 DEFINE_string build_instance \
@@ -26,11 +29,13 @@
 DEFINE_string variant master \
   "Variant to build: generally master or stable"
 
+SSH_FLAGS=(${INTERNAL_IP})
+
 wait_for_instance() {
   alive=""
   while [[ -z "${alive}" ]]; do
     sleep 5
-    alive="$(gcloud compute ssh "$@" -- uptime || true)"
+    alive="$(gcloud compute ssh "${SSH_FLAGS[@]}" "$@" -- uptime || true)"
   done
 }
 
@@ -102,10 +107,11 @@
   gcloud compute instances attach-disk \
       "${dest_project_flag[@]}" \
       "${FLAGS_build_instance}" --disk="${FLAGS_dest_image}"
-  gcloud compute scp "${dest_project_flag[@]}" \
+  # beta for the --internal-ip flag that may be passed via SSH_FLAGS
+  gcloud beta compute scp "${SSH_FLAGS[@]}" "${dest_project_flag[@]}" \
     "${source_files[@]}" \
     "${FLAGS_build_instance}:"
-  gcloud compute ssh \
+  gcloud compute ssh "${SSH_FLAGS[@]}" \
     "${dest_project_flag[@]}" "${FLAGS_build_instance}" -- \
     ./create_base_image_gce.sh
   gcloud compute instances delete -q \