diff --git a/backend/gce.go b/backend/gce.go index ccd3de5f1..6d7b57c0c 100644 --- a/backend/gce.go +++ b/backend/gce.go @@ -107,19 +107,20 @@ var ( "RATE_LIMIT_DYNAMIC_CONFIG": "get max-calls and duration dynamically through redis (default false)", "RATE_LIMIT_DYNAMIC_CONFIG_TTL": fmt.Sprintf("time to cache dynamic config for (default %v)", defaultGCERateLimitDynamicConfigTTL), - "BACKOFF_RETRY_MAX": "Maximum allowed duration of generic exponential backoff retries (default 1m)", - "REGION": fmt.Sprintf("only takes effect when SUBNETWORK is defined; region in which to deploy (default %v)", defaultGCERegion), - "SKIP_STOP_POLL": "immediately return after issuing first instance deletion request (default false)", - "SSH_DIAL_TIMEOUT": fmt.Sprintf("connection timeout for ssh connections (default %v)", defaultGCESSHDialTimeout), - "STOP_POLL_SLEEP": fmt.Sprintf("sleep interval between polling server for instance stop status (default %v)", defaultGCEStopPollSleep), - "STOP_PRE_POLL_SLEEP": fmt.Sprintf("time to sleep prior to polling server for instance stop status (default %v)", defaultGCEStopPrePollSleep), - "SUBNETWORK": fmt.Sprintf("the subnetwork in which to launch build instances (gce internal default \"%v\")", defaultGCESubnet), - "UPLOAD_RETRIES": fmt.Sprintf("number of times to attempt to upload script before erroring (default %d)", defaultGCEUploadRetries), - "UPLOAD_RETRY_SLEEP": fmt.Sprintf("sleep interval between script upload attempts (default %v)", defaultGCEUploadRetrySleep), - "WARMER_URL": "URL for warmer service", - "WARMER_TIMEOUT": fmt.Sprintf("timeout for requests to warmer service (default %v)", defaultGCEWarmerTimeout), - "WARMER_SSH_PASSPHRASE": fmt.Sprintf("The passphrase used to decipher instace SSH keys"), - "ZONE": fmt.Sprintf("zone name (default %q)", defaultGCEZone), + "BACKOFF_RETRY_MAX": "Maximum allowed duration of generic exponential backoff retries (default 1m)", + "REGION": fmt.Sprintf("only takes effect when SUBNETWORK is defined; region in which to deploy (default %v)", defaultGCERegion), + "SKIP_STOP_POLL": "immediately return after issuing first instance deletion request (default false)", + "SSH_DIAL_TIMEOUT": fmt.Sprintf("connection timeout for ssh connections (default %v)", defaultGCESSHDialTimeout), + "STARTUP_SCRIPT_ADDITION": "Additional commands to run during VM startup", + "STOP_POLL_SLEEP": fmt.Sprintf("sleep interval between polling server for instance stop status (default %v)", defaultGCEStopPollSleep), + "STOP_PRE_POLL_SLEEP": fmt.Sprintf("time to sleep prior to polling server for instance stop status (default %v)", defaultGCEStopPrePollSleep), + "SUBNETWORK": fmt.Sprintf("the subnetwork in which to launch build instances (gce internal default \"%v\")", defaultGCESubnet), + "UPLOAD_RETRIES": fmt.Sprintf("number of times to attempt to upload script before erroring (default %d)", defaultGCEUploadRetries), + "UPLOAD_RETRY_SLEEP": fmt.Sprintf("sleep interval between script upload attempts (default %v)", defaultGCEUploadRetrySleep), + "WARMER_URL": "URL for warmer service", + "WARMER_TIMEOUT": fmt.Sprintf("timeout for requests to warmer service (default %v)", defaultGCEWarmerTimeout), + "WARMER_SSH_PASSPHRASE": fmt.Sprintf("The passphrase used to decipher instace SSH keys"), + "ZONE": fmt.Sprintf("zone name (default %q)", defaultGCEZone), } errGCEMissingIPAddressError = fmt.Errorf("no IP address found") @@ -131,6 +132,7 @@ cat > ~travis/.ssh/authorized_keys <