CreateInstance of GceHelper accepts arch as parameter

Author: 0405ysj

tools/baseimage/cmd/create_gce_fixed_kernel/main.go

@@ -84,7 +84,7 @@ func createImageMain(project, zone string, opts kernelImageOpts) error {
 	}
 	log.Printf("disk created: %q", attachedDiskName)
 	log.Println("creating instance...")
-	ins, err := h.CreateInstance(insName)
+	ins, err := h.CreateInstance(insName, gce.ArchX86)
 	if err != nil {
 		return fmt.Errorf("failed to create instance: %w", err)
 	}

tools/baseimage/cmd/create_gce_x86_64_image/main.go

@@ -85,7 +85,7 @@ func createImageMain(project, zone string, opts createImageOpts) error {
 	}
 	log.Printf("disk created: %q", attachedDiskName)
 	log.Println("creating instance...")
-	ins, err := h.CreateInstance(insName)
+	ins, err := h.CreateInstance(insName, gce.ArchX86)
 	if err != nil {
 		return fmt.Errorf("failed to create instance: %w", err)
 	}

tools/baseimage/cmd/gce_install_cuttlefish_packages/main.go

@@ -184,7 +184,7 @@ func amendImageMain(project, zone string, opts amendImageOpts) error {
 	defer cleanupDeleteDisk(h, attachedDiskName)
 
 	log.Println("creating instance...")
-	_, err = h.CreateInstance(insName)
+	_, err = h.CreateInstance(insName, gce.ArchX86)
 	if err != nil {
 		return fmt.Errorf("failed to create instance: %w", err)
 	}

tools/baseimage/pkg/gce/arch.go

@@ -0,0 +1,38 @@
+// Copyright (C) 2025 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package gce
+
+import (
+	"fmt"
+)
+
+type Arch int
+
+const (
+	ArchUnknown Arch = iota
+	ArchX86
+	ArchArm
+)
+
+func ParseArch(s string) (Arch, error) {
+	switch s {
+	case "x86_64":
+		return ArchX86, nil
+	case "arm64":
+		return ArchArm, nil
+	default:
+		return ArchUnknown, fmt.Errorf("unknown arch %q", s)
+	}
+}

tools/baseimage/pkg/gce/helper.go

@@ -91,15 +91,25 @@ func (h *GceHelper) DetachDisk(ins, disk string) error {
 	return h.waitForOperation(op)
 }
 
-func (h *GceHelper) CreateInstance(name string) (*compute.Instance, error) {
+func (h *GceHelper) CreateInstance(name string, arch Arch) (*compute.Instance, error) {
+	var machineType, sourceImage string
+	switch arch {
+	case ArchX86:
+		machineType = "n1-standard-16"
+		sourceImage = "debian-12-bookworm-v20250415"
+	case ArchArm:
+		machineType = "t2a-standard-16"
+		sourceImage = "debian-12-bookworm-arm64-v20250415"
+	default:
+		return nil, errors.New("unsupported arch")
+	}
 	payload := &compute.Instance{
-		Name:           name,
-		MachineType:    fmt.Sprintf("zones/%s/machineTypes/%s", h.Zone, "n1-standard-16"),
-		MinCpuPlatform: "Intel Haswell",
+		Name:        name,
+		MachineType: fmt.Sprintf("zones/%s/machineTypes/%s", h.Zone, machineType),
 		Disks: []*compute.AttachedDisk{
 			{
 				InitializeParams: &compute.AttachedDiskInitializeParams{
-					SourceImage: "projects/debian-cloud/global/images/debian-12-bookworm-v20250415",
+					SourceImage: fmt.Sprintf("projects/debian-cloud/global/images/%s", sourceImage),
 				},
 				Boot:       true,
 				AutoDelete: true,