Skip to content

Commit 24469dd

Browse files
committed
dashboard: update OpenBSD 6.4 builders to final release
Previously, they were running a 6.4 snapshot release from October 4, 2018, added in CL 139857. The final release of OpenBSD 6.4 has been released on October 18, 2018, and can be used now. See https://www.openbsd.org/64.html. Fixup unbound variable in env/openbsd-amd64/make.bash: $ ./make.bash ./make.bash: line 57: PKG_ADD_OPTIONS: unbound variable The amd64 architecture image was tested with cmd/debugnewvm and passed all tests successfully. Updates golang/go#26833. Change-Id: I0e3b1ed5aa9b2e624d9afbe46a8a344f88ddcc56 Reviewed-on: https://go-review.googlesource.com/c/143458 Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent b3b29ee commit 24469dd

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

dashboard/builders.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,19 +147,19 @@ var Hosts = map[string]*HostConfig{
147147
SSHUsername: "gopher",
148148
},
149149
"host-openbsd-amd64-64": &HostConfig{
150-
VMImage: "openbsd-amd64-64-snap1",
150+
VMImage: "openbsd-amd64-64",
151151
machineType: "n1-highcpu-4",
152152
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-amd64-64",
153153
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-amd64-64.tar.gz",
154-
Notes: "OpenBSD 6.4 snapshot from Oct 4, 2018; GCE VM is built from script in build/env/openbsd-amd64",
154+
Notes: "OpenBSD 6.4; GCE VM is built from script in build/env/openbsd-amd64",
155155
SSHUsername: "gopher",
156156
},
157157
"host-openbsd-386-64": &HostConfig{
158-
VMImage: "openbsd-386-64-snap1",
158+
VMImage: "openbsd-386-64",
159159
machineType: "n1-highcpu-4",
160160
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.openbsd-386-64",
161161
goBootstrapURLTmpl: "https://storage.googleapis.com/$BUCKET/gobootstrap-openbsd-386-64.tar.gz",
162-
Notes: "OpenBSD 6.4 snapshot from Oct 4, 2018; GCE VM is built from script in build/env/openbsd-386",
162+
Notes: "OpenBSD 6.4; GCE VM is built from script in build/env/openbsd-386",
163163
SSHUsername: "gopher",
164164
},
165165
"host-freebsd-93-gce": &HostConfig{

env/openbsd-amd64/make.bash

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ trap cleanup EXIT INT
5050
# Currently we download them from the network during the install process.
5151

5252
# Create custom siteXX.tgz set.
53+
PKG_ADD_OPTIONS=""
5354
if [[ "$SNAPSHOT" = true ]]; then
5455
PKG_ADD_OPTIONS="-D snap"
5556
fi

0 commit comments

Comments
 (0)