dashboard, env/openbsd: add OpenBSD 6.4 snapshot builders

This change adds amd64 and 386 OpenBSD 6.4 snapshot builders.
The snapshots are from October 4, 2018:

	/pub/OpenBSD/snapshots/amd64/BUILDINFO:
	Build date: 1538669162 - Thu Oct  4 16:06:02 UTC 2018

	/pub/OpenBSD/snapshots/i386/BUILDINFO:
	Build date: 1538681766 - Thu Oct  4 19:36:06 UTC 2018

These are meant to be replaced with the final version of OpenBSD 6.4
when it is released.

Modify make.bash to support fetching snapshot versions.

The amd64 architecture image was tested with cmd/debugnewvm
and passed all tests successfully.

Updates golang/go#26833.

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

Author: dmitshur

dashboard/builders.go

@@ -146,6 +146,22 @@ var Hosts = map[string]*HostConfig{
 		Notes:              "OpenBSD 6.2; GCE VM is built from script in build/env/openbsd-386",
 		SSHUsername:        "gopher",
 	},
+	"host-openbsd-amd64-64": &HostConfig{
+		VMImage:            "openbsd-amd64-64-snap1",
+		machineType:        "n1-highcpu-4",
+		buildletURLTmpl:    "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-amd64-64",
+		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-amd64-64.tar.gz",
+		Notes:              "OpenBSD 6.4 snapshot from Oct 4, 2018; GCE VM is built from script in build/env/openbsd-amd64",
+		SSHUsername:        "gopher",
+	},
+	"host-openbsd-386-64": &HostConfig{
+		VMImage:            "openbsd-386-64-snap1",
+		machineType:        "n1-highcpu-4",
+		buildletURLTmpl:    "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386-64",
+		goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-386-64.tar.gz",
+		Notes:              "OpenBSD 6.4 snapshot from Oct 4, 2018; 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",
@@ -1315,6 +1331,21 @@ func init() {
 		numTryTestHelpers: 5,
 		MaxAtOnce:         1,
 	})
+	addBuilder(BuildConfig{
+		Name:              "openbsd-amd64-64",
+		HostType:          "host-openbsd-amd64-64",
+		ShouldRunDistTest: noTestDir,
+		TryBot:            false,
+		numTestHelpers:    0,
+		numTryTestHelpers: 5,
+		MaxAtOnce:         1,
+	})
+	addBuilder(BuildConfig{
+		Name:              "openbsd-386-64",
+		HostType:          "host-openbsd-386-64",
+		ShouldRunDistTest: noTestDir,
+		MaxAtOnce:         1,
+	})
 	addBuilder(BuildConfig{
 		Name:              "netbsd-amd64-8_0",
 		HostType:          "host-netbsd-amd64-8_0",

env/openbsd-amd64/README

@@ -7,15 +7,15 @@ Debian packages: expect qemu-utils qemu-system-x86.
 After it completes, it creates a file openbsd-amd64-gce.tar.gz
 
 Then:
-    gsutil cp -a public-read openbsd-amd64-gce.tar.gz gs://go-builder-data/openbsd-amd64-gce.tar.gz
+    gsutil cp -a public-read openbsd-amd64-gce.tar.gz gs://go-builder-data/openbsd-amd64-64-snap1.tar.gz
 Or just use the web UI at:
     https://console.developers.google.com/project/symbolic-datum-552/storage/browser/go-builder-data/
 
 Then:
-   gcloud compute --project symbolic-datum-552 images delete openbsd-amd64-56
-   gcloud compute --project symbolic-datum-552 images create openbsd-amd64-56 --source-uri gs://go-builder-data/openbsd-amd64-gce.tar.gz
+   gcloud compute --project symbolic-datum-552 images delete openbsd-amd64-64-snap1
+   gcloud compute --project symbolic-datum-552 images create openbsd-amd64-64-snap1 --source-uri gs://go-builder-data/openbsd-amd64-64-snap1.tar.gz
 
 The VM needs to be run with the GCE metadata attribute "buildlet-binary-url" set to a URL
 of the OpenBSD buildlet (cross-compiled, typically).
 
-    buildlet-binary-url == http://storage.googleapis.com/go-builder-data/buildlet.openbsd-amd64
+    buildlet-binary-url == https://storage.googleapis.com/go-builder-data/buildlet.openbsd-amd64

env/openbsd-amd64/make.bash

@@ -8,8 +8,9 @@
 set -e
 set -u
 
-readonly VERSION="6.3"
+readonly VERSION="6.4"
 readonly RELNO="${VERSION/./}"
+readonly SNAPSHOT=false
 
 readonly ARCH="${ARCH:-amd64}"
 readonly MIRROR="${MIRROR:-ftp.usa.openbsd.org}"
@@ -23,7 +24,11 @@ readonly ISO="install${RELNO}-${ARCH}.iso"
 readonly ISO_PATCHED="install${RELNO}-${ARCH}-patched.iso"
 
 if [[ ! -f "${ISO}" ]]; then
-  curl -o "${ISO}" "https://${MIRROR}/pub/OpenBSD/${VERSION}/${ARCH}/install${RELNO}.iso"
+  DIR="${VERSION}"
+  if [[ "$SNAPSHOT" = true ]]; then
+    DIR="snapshots"
+  fi
+  curl -o "${ISO}" "https://${MIRROR}/pub/OpenBSD/${DIR}/${ARCH}/install${RELNO}.iso"
 fi
 
 function cleanup() {
@@ -45,11 +50,14 @@ trap cleanup EXIT INT
 # Currently we download them from the network during the install process.
 
 # Create custom siteXX.tgz set.
+if [[ "$SNAPSHOT" = true ]]; then
+  PKG_ADD_OPTIONS="-D snap"
+fi
 mkdir -p etc
 cat >install.site <<EOF
 #!/bin/sh
 syspatch
-pkg_add -iv bash curl git
+pkg_add -iv ${PKG_ADD_OPTIONS} bash curl git
 
 echo 'set tty com0' > boot.conf
 EOF