commit 3fe97baa26d8a0cfd1f854e519478336c1ae52f1
author Philipp Wollermann <philwo@google.com> Tue Jan 09 18:54:11 2018 +0100
committer Philipp Wollermann <philwo@google.com> Tue Jan 09 18:54:11 2018 +0100
tree 2ca27806ac101263bcc7653fcd14e202e2ae080b
parent d9f1877c17fe119a5f64bc3c9e65f1fdac11906a

Revert Windows VMs to Haswell CPU.

This fixes the JVM hang during "Archive Artifacts" step that broke our
nightly builds.

Change-Id: Ia919abf11af105979a72325f5165a9b1dccf0899

gce/vm.sh

diff --git a/gce/vm.sh b/gce/vm.sh
index 635f8ad..1192778 100755
--- a/gce/vm.sh
+++ b/gce/vm.sh
@@ -142,14 +142,6 @@
   local STARTUP_METADATA="$6"
   shift 6
 
-  if [[ $IMAGE == ubuntu-* ]]; then
-    IMAGE_FLAG="--image-project=ubuntu-os-cloud --image-family=$IMAGE"
-    SSD_INTERFACE="nvme"
-  else
-    IMAGE_FLAG="--image $IMAGE"
-    SSD_INTERFACE="scsi"
-  fi
-
   if [[ $TAG == *-staging ]]; then
     MACHINE_TYPE="n1-standard-8"
     BOOT_DISK_SIZE="250GB"
@@ -158,6 +150,20 @@
     BOOT_DISK_SIZE="500GB"
   fi
 
+  CPU_PLATFORM="Intel Skylake"
+  if [[ $IMAGE == ubuntu-* ]]; then
+    IMAGE_FLAG="--image-project=ubuntu-os-cloud --image-family=$IMAGE"
+    LOCAL_SSD="--local-ssd interface=nvme"
+  elif [[ $IMAGE == windows-* ]]; then
+    CPU_PLATFORM="Intel Haswell"
+    MACHINE_TYPE="n1-standard-16"
+    IMAGE_FLAG="--image $IMAGE"
+    LOCAL_SSD=""
+  else
+    IMAGE_FLAG="--image $IMAGE"
+    LOCAL_SSD="--local-ssd interface=scsi"
+  fi
+
   gcloud compute instances create "$TAG" \
       --zone "$LOCATION" \
       --machine-type "$MACHINE_TYPE" \
@@ -165,9 +171,9 @@
       $IMAGE_FLAG \
       --metadata-from-file "$STARTUP_METADATA" \
       --metadata jenkins_node="$JENKINS_NODE" \
-      --min-cpu-platform "Intel Skylake" \
+      --min-cpu-platform "$CPU_PLATFORM" \
       --boot-disk-type pd-ssd --boot-disk-size "$BOOT_DISK_SIZE" \
-      --local-ssd interface="$SSD_INTERFACE"
+      $LOCAL_SSD
 
   case "$TAG" in
     windows-*)