env/openbsd, dashboard: add OpenBSD 6.2 386 builder

Fixes golang/go#22835

Change-Id: I2763035fd60bf348d8ccc532045c9cf33c405a52
Reviewed-on: https://go-review.googlesource.com/81875
Reviewed-by: Brad Fitzpatrick <[email protected]>

Author: bradfitz

dashboard/builders.go

@@ -125,17 +125,14 @@ var Hosts = map[string]*HostConfig{
 		Notes:              "OpenBSD 6.2; GCE VM is built from script in build/env/openbsd-amd64",
 		SSHUsername:        "gopher",
 	},
-	// Currently broken: See comments on CL 79055.
-	/*
-		"host-openbsd-386-62": &HostConfig{
-				VMImage:            "openbsd-386-62",
-				machineType:        "n1-highcpu-4",
-				buildletURLTmpl:    "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386",
-				goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-386-60.tar.gz",
-				Notes:              "OpenBSD 6.2; GCE VM is built from script in build/env/openbsd-386",
-				SSHUsername:        "gopher",
-			},
-	*/
+	"host-openbsd-386-62": &HostConfig{
+		VMImage:            "openbsd-386-62-a",
+		machineType:        "n1-highcpu-4",
+		buildletURLTmpl:    "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386",
+		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-386-60.tar.gz",
+		Notes:              "OpenBSD 6.2; GCE VM is built from script in build/env/openbsd-386",
+		SSHUsername:        "gopher",
+	},
 	"host-freebsd-93-gce": &HostConfig{
 		VMImage:            "freebsd-amd64-gce93",
 		machineType:        "n1-highcpu-4",
@@ -1092,6 +1089,11 @@ func init() {
 		HostType:  "host-openbsd-386-60",
 		MaxAtOnce: 1,
 	})
+	addBuilder(BuildConfig{
+		Name:      "openbsd-386-62",
+		HostType:  "host-openbsd-386-62",
+		MaxAtOnce: 1,
+	})
 	addBuilder(BuildConfig{
 		Name:              "openbsd-amd64-62",
 		HostType:          "host-openbsd-amd64-62",

env/openbsd-amd64/make.bash

@@ -128,7 +128,7 @@ qemu-img create -f raw disk.raw 10G
 
 # Run the installer to create the disk image.
 expect <<EOF
-set timeout 600
+set timeout 1800
 
 spawn qemu-system-x86_64 -nographic -smp 2 \
   -drive if=virtio,file=disk.raw,format=raw -cdrom "${ISO_PATCHED}" \