From 041802c951b3940db21e525a27f1e56c76f18290 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 3 Nov 2017 14:16:39 +0100 Subject: [PATCH 1/3] Revert "simplify create windows debug worker script" This reverts commit 4160ec4dc0e4c0e950672b9516ead0dbda7208e0. --- tools/gce/create_windows_debug_worker.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/tools/gce/create_windows_debug_worker.sh b/tools/gce/create_windows_debug_worker.sh index b56c8d95d99..9ac82eb3f65 100755 --- a/tools/gce/create_windows_debug_worker.sh +++ b/tools/gce/create_windows_debug_worker.sh @@ -32,6 +32,17 @@ else fi MACHINE_TYPE=n1-standard-8 +TMP_DISK_NAME="$INSTANCE_NAME-temp-disk" + +gcloud compute disks create $TMP_DISK_NAME \ + --project="$CLOUD_PROJECT" \ + --zone "$ZONE" \ + --image-project google.com:kokoro \ + --image empty-100g-image \ + --type pd-ssd + +echo 'Created scratch disk, waiting for it to become available.' +sleep 15 gcloud compute instances create $INSTANCE_NAME \ --project="$CLOUD_PROJECT" \ @@ -39,6 +50,6 @@ gcloud compute instances create $INSTANCE_NAME \ --machine-type $MACHINE_TYPE \ --image-project google.com:kokoro \ --image kokoro-win7build-v9-prod-debug \ - --boot-disk-size 500 \ - --boot-disk-type pd-ssd \ - --tags=allow-ssh + --boot-disk-type pd-ssd \ + --tags=allow-ssh \ + --disk auto-delete=yes,boot=no,name=$TMP_DISK_NAME From 1e9af124f1dcea1afdc59af19088b6146494639f Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 3 Nov 2017 14:18:30 +0100 Subject: [PATCH 2/3] fix indentation --- tools/gce/create_windows_debug_worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gce/create_windows_debug_worker.sh b/tools/gce/create_windows_debug_worker.sh index 9ac82eb3f65..5c19eae5f1e 100755 --- a/tools/gce/create_windows_debug_worker.sh +++ b/tools/gce/create_windows_debug_worker.sh @@ -50,6 +50,6 @@ gcloud compute instances create $INSTANCE_NAME \ --machine-type $MACHINE_TYPE \ --image-project google.com:kokoro \ --image kokoro-win7build-v9-prod-debug \ - --boot-disk-type pd-ssd \ + --boot-disk-type pd-ssd \ --tags=allow-ssh \ --disk auto-delete=yes,boot=no,name=$TMP_DISK_NAME From 64ef0400dd96e559d71a4e8361aa5ca74fa19a1c Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 3 Nov 2017 14:21:52 +0100 Subject: [PATCH 3/3] larger boot drive --- tools/gce/create_windows_debug_worker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/gce/create_windows_debug_worker.sh b/tools/gce/create_windows_debug_worker.sh index 5c19eae5f1e..da8050be4b1 100755 --- a/tools/gce/create_windows_debug_worker.sh +++ b/tools/gce/create_windows_debug_worker.sh @@ -50,6 +50,7 @@ gcloud compute instances create $INSTANCE_NAME \ --machine-type $MACHINE_TYPE \ --image-project google.com:kokoro \ --image kokoro-win7build-v9-prod-debug \ + --boot-disk-size 500 \ --boot-disk-type pd-ssd \ --tags=allow-ssh \ --disk auto-delete=yes,boot=no,name=$TMP_DISK_NAME