Revert "Upgrade Bazel CI machines (#2689)"

This reverts commit 1fd2cabed5dabb5fc382af9dd1320af539724925.

Docker support is completely broken, so I'm reverting to old VM images. However, they won't run on c3d machines, so I need to revert this change, too.

buildkite/create_images.py

diff --git a/buildkite/create_images.py b/buildkite/create_images.py
index 7fdb42b..81a923e 100755
--- a/buildkite/create_images.py
+++ b/buildkite/create_images.py
@@ -23,7 +23,7 @@
 import gcloud_utils
 
 DEBUG = False
-DEFAULT_MACHINE_TYPE = "c3d-standard-8"
+DEFAULT_MACHINE_TYPE = "c2-standard-8"
 DEFAULT_BOOT_DISK_TYPE = "pd-ssd"
 
 IMAGE_CREATION_VMS = {
@@ -33,7 +33,7 @@
         "source_image_project": "ubuntu-os-cloud",
         "source_image_family": "ubuntu-2204-lts",
         "setup_script": "setup-docker.sh",
-        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE", "GVNIC"],
+        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE"],
         "licenses": [
             "https://www.googleapis.com/compute/v1/projects/vm-options/global/licenses/enable-vmx"
         ],
@@ -44,7 +44,7 @@
         "source_image_project": "ubuntu-os-cloud",
         "source_image_family": "ubuntu-2204-lts-arm64",
         "setup_script": "setup-docker.sh",
-        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE", "GVNIC"],
+        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE"],
         "licenses": [
             "https://www.googleapis.com/compute/v1/projects/vm-options/global/licenses/enable-vmx"
         ],
@@ -57,7 +57,7 @@
         "source_image_project": "windows-cloud",
         "source_image_family": "windows-2022", # vs build tools failed to install on windows-2022-core
         "setup_script": "setup-windows.ps1",
-        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE", "GVNIC"],
+        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE"],
     },
     "windows-playground": {
         "project": "di-cloud-exp",
@@ -66,7 +66,7 @@
         "source_image_project": "windows-cloud",
         "source_image_family": "windows-2022",
         "setup_script": "setup-windows.ps1",
-        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE", "GVNIC"],
+        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE"],
     },
 }
 

buildkite/instances.yml

diff --git a/buildkite/instances.yml b/buildkite/instances.yml
index 2175946..514008f 100644
--- a/buildkite/instances.yml
+++ b/buildkite/instances.yml
@@ -14,7 +14,7 @@
 default_vm:
   boot_disk_size: 500GB
   boot_disk_type: pd-ssd
-  machine_type: c3d-standard-30
+  machine_type: c2-standard-30
   network: default
   region: us-central1
   restart-on-failure: False
@@ -26,7 +26,7 @@
   initial_delay: 60
 instance_groups:
   - name: bk-docker
-    count: 200
+    count: 140
     project: bazel-untrusted
     service_account: buildkite@bazel-untrusted.iam.gserviceaccount.com
     image_family: bk-docker
@@ -71,7 +71,7 @@
     zone: us-central1-c
     boot_disk_type: hyperdisk-balanced
   - name: bk-windows
-    count: 60
+    count: 40
     project: bazel-untrusted
     service_account: buildkite@bazel-untrusted.iam.gserviceaccount.com
     image_family: bk-windows

buildkite/promote_images.py

diff --git a/buildkite/promote_images.py b/buildkite/promote_images.py
index 61fb8ff..25187ef 100755
--- a/buildkite/promote_images.py
+++ b/buildkite/promote_images.py
@@ -27,7 +27,7 @@
         "project": "bazel-public",
         "source_image_project": "bazel-public",
         "source_image_family": "bk-testing-docker",
-        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE", "GVNIC"],
+        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE"],
         "licenses": [
             "https://www.googleapis.com/compute/v1/projects/vm-options/global/licenses/enable-vmx"
         ],
@@ -36,7 +36,7 @@
         "project": "bazel-public",
         "source_image_project": "bazel-public",
         "source_image_family": "bk-testing-docker-arm64",
-        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE", "GVNIC"],
+        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE"],
         "licenses": [
             "https://www.googleapis.com/compute/v1/projects/vm-options/global/licenses/enable-vmx"
         ],
@@ -45,7 +45,7 @@
         "project": "bazel-public",
         "source_image_project": "bazel-public",
         "source_image_family": "bk-testing-windows",
-        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE", "GVNIC"],
+        "guest_os_features": ["VIRTIO_SCSI_MULTIQUEUE"],
     },
 }