Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dashboard: add OpenBSD 7.3 and 7.4 builders for 386, amd64 #79

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+67 −5
Open

dashboard: add OpenBSD 7.3 and 7.4 builders for 386, amd64 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 62 additions & 0 deletions dashboard/builders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,30 @@ var Hosts = map[string]*HostConfig{
Notes: "OpenBSD 7.2; GCE VM, built from build/env/openbsd-amd64",
SSHUsername: "gopher",
},
"host-openbsd-386-73": {
VMImage: "openbsd-386-73",
machineType: "n2", // force Intel; see go.dev/issue/49209
Notes: "OpenBSD 7.3; GCE VM, built from build/env/openbsd-386",
SSHUsername: "gopher",
},
"host-openbsd-amd64-73": {
VMImage: "openbsd-amd64-73",
machineType: "n2", // force Intel; see go.dev/issue/49209
Notes: "OpenBSD 7.3; GCE VM, built from build/env/openbsd-amd64",
SSHUsername: "gopher",
},
"host-openbsd-386-74": {
VMImage: "openbsd-386-74",
machineType: "n2", // force Intel; see go.dev/issue/49209
Notes: "OpenBSD 7.4; GCE VM, built from build/env/openbsd-386",
SSHUsername: "gopher",
},
"host-openbsd-amd64-74": {
VMImage: "openbsd-amd64-74",
machineType: "n2", // force Intel; see go.dev/issue/49209
Notes: "OpenBSD 7.4; GCE VM, built from build/env/openbsd-amd64",
SSHUsername: "gopher",
},
"host-openbsd-arm-joelsing": {
IsReverse: true,
ExpectNum: 1,
Expand Down Expand Up @@ -2062,6 +2086,44 @@ func init() {
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "openbsd-amd64-73",
HostType: "host-openbsd-amd64-73",
tryBot: defaultTrySet(),
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "openbsd-386-73",
HostType: "host-openbsd-386-73",
tryBot: explicitTrySet("sys"),
buildsRepo: func(repo, branch, goBranch string) bool {
// https://go.dev/issue/49529: git seems to be too slow on this
// platform.
return repo != "review" && buildRepoByDefault(repo)
},
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "openbsd-amd64-74",
HostType: "host-openbsd-amd64-74",
tryBot: defaultTrySet(),
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "openbsd-386-74",
HostType: "host-openbsd-386-74",
tryBot: explicitTrySet("sys"),
buildsRepo: func(repo, branch, goBranch string) bool {
// https://go.dev/issue/49529: git seems to be too slow on this
// platform.
return repo != "review" && buildRepoByDefault(repo)
},
distTestAdjust: noTestDirAndNoReboot,
numTryTestHelpers: 4,
})
addBuilder(BuildConfig{
Name: "openbsd-arm-jsing",
HostType: "host-openbsd-arm-joelsing",
Expand Down
8 changes: 4 additions & 4 deletions env/openbsd-amd64/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ OpenBSD builder, booting up to run the buildlet.

make.bash should be run on a Linux box with expect and qemu.
Debian packages: expect qemu-utils qemu-system-x86 growisofs genisoimage.
VERSION=7.2 ARCH=amd64 ./make.bash
VERSION=7.4 ARCH=amd64 ./make.bash

After it completes, it creates a file openbsd-${VERSION}-${ARCH}-gce.tar.gz

Then:
gsutil cp -a public-read openbsd-7.2-amd64-gce.tar.gz gs://go-builder-data/openbsd-amd64-72.tar.gz
gsutil cp -a public-read openbsd-7.4-amd64-gce.tar.gz gs://go-builder-data/openbsd-amd64-74.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-72
gcloud compute --project symbolic-datum-552 images create openbsd-amd64-72 --source-uri gs://go-builder-data/openbsd-amd64-72.tar.gz
gcloud compute --project symbolic-datum-552 images delete openbsd-amd64-74
gcloud compute --project symbolic-datum-552 images create openbsd-amd64-74 --source-uri gs://go-builder-data/openbsd-amd64-74.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).
Expand Down
2 changes: 1 addition & 1 deletion env/openbsd-amd64/make.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -e
set -u

# Update to the version listed on https://openbsd.org
readonly VERSION="${VERSION:-7.2}"
readonly VERSION="${VERSION:-7.4}"
readonly RELNO="${VERSION/./}"
readonly SNAPSHOT=false

Expand Down