From: Tim Johnson <tijohnson@linuxfoundation.org>
Date: Wed, 3 Jul 2019 16:40:33 +0000 (-0700)
Subject: Update Virtual HW to v2-highcpu-1
X-Git-Tag: v0.4.0~16
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=1a757f912c51e6dbf2824b818f69d404d2982b65;p=releng%2Fcommon-packer.git

Update Virtual HW to v2-highcpu-1

Specify the volume size build agent to 20(GB). The defualt values for
v1-standard-1 were adequate (40GB), but the default values for
v2-highcpu-1 were not.

Issue: RELENG-2158
Change-Id: I6db62229d90573b899947171e3dba83fb00efe71
Signed-off-by: Tim Johnson <tijohnson@linuxfoundation.org>
---

diff --git a/templates/builder.json b/templates/builder.json
index f30c54c..c370709 100644
--- a/templates/builder.json
+++ b/templates/builder.json
@@ -7,11 +7,11 @@
     "cloud_user_data": null,
     "cloud_region": "ca-ymq-1",
     "cloud_availability_zone": "ca-ymq-2",
-    "vm_use_block_storage": "false",
-    "vm_volume_size": "10",
+    "vm_use_block_storage": "true",
+    "vm_volume_size": "20",
     "vm_image_disk_format": "",
     "distro": null,
-    "flavor": "v1-standard-1",
+    "flavor": "v2-highcpu-1",
     "ssh_user": null,
     "ssh_proxy_host": ""
   },
diff --git a/templates/docker.json b/templates/docker.json
index b02ccfb..8751347 100644
--- a/templates/docker.json
+++ b/templates/docker.json
@@ -7,11 +7,11 @@
     "cloud_user_data": null,
     "cloud_region": "ca-ymq-1",
     "cloud_availability_zone": "ca-ymq-2",
-    "vm_use_block_storage": "false",
-    "vm_volume_size": "10",
+    "vm_use_block_storage": "true",
+    "vm_volume_size": "20",
     "vm_image_disk_format": "",
     "distro": null,
-    "flavor": "v1-standard-1",
+    "flavor": "v2-highcpu-1",
     "ssh_user": null,
     "ssh_proxy_host": ""
   },
diff --git a/templates/windows-builder.json b/templates/windows-builder.json
index ff74e9b..8e6ede7 100644
--- a/templates/windows-builder.json
+++ b/templates/windows-builder.json
@@ -7,11 +7,11 @@
     "cloud_user_data": null,
     "cloud_region": "ca-ymq-1",
     "cloud_availability_zone": "ca-ymq-2",
-    "vm_use_block_storage": "false",
-    "vm_volume_size": "10",
+    "vm_use_block_storage": "true",
+    "vm_volume_size": "20",
     "vm_image_disk_format": "",
     "distro": null,
-    "flavor": "v1-standard-4"
+    "flavor": "v2-highcpu-4"
   },
   "builders": [
     {