Skip to content

Commit 7980781

Browse files
committed
env/openbsd-amd64: update build image script to OpenBSD 7.6
OpenBSD 7.6 has been released, meaning that the only two supported versions are 7.5 and 7.6. Update the image build script for 7.6. Additionally, bump the maxproc limit for the swarming user, which will hopefully reduce the number of failures due to fork/exec returning EAGAIN. Updates golang/go#66474 Updates golang/go#69823 Change-Id: Ie2667de2defefbb6a56adca3dec92d7663c615e4 Reviewed-on: https://go-review.googlesource.com/c/build/+/618895 Reviewed-by: Cherry Mui <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent ad1c807 commit 7980781

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

env/openbsd-amd64/README

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ OpenBSD builder, booting up to run the buildlet.
33

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

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

1010
Then:
11-
gsutil cp -a public-read openbsd-7.2-amd64-gce.tar.gz gs://go-builder-data/openbsd-amd64-72.tar.gz
11+
gsutil cp -a public-read openbsd-7.6-amd64-gce.tar.gz gs://go-builder-data/openbsd-amd64-76.tar.gz
1212
Or just use the web UI at:
1313
https://console.developers.google.com/project/symbolic-datum-552/storage/browser/go-builder-data/
1414

1515
Then:
16-
gcloud compute --project symbolic-datum-552 images delete openbsd-amd64-72
17-
gcloud compute --project symbolic-datum-552 images create openbsd-amd64-72 --source-uri gs://go-builder-data/openbsd-amd64-72.tar.gz
16+
gcloud compute --project symbolic-datum-552 images delete openbsd-amd64-76
17+
gcloud compute --project symbolic-datum-552 images create openbsd-amd64-76 --source-uri gs://go-builder-data/openbsd-amd64-76.tar.gz
1818

1919
The VM needs to be run with the GCE metadata attribute "buildlet-binary-url" set to a URL
2020
of the OpenBSD buildlet (cross-compiled, typically).

env/openbsd-amd64/make.bash

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -e
77
set -u
88

99
# Update to the version listed on https://openbsd.org
10-
readonly VERSION="${VERSION:-7.2}"
10+
readonly VERSION="${VERSION:-7.6}"
1111
readonly RELNO="${VERSION/./}"
1212
readonly SNAPSHOT=false
1313

@@ -63,18 +63,17 @@ moreres:\
6363
:vmemoryuse-cur=infinity: \
6464
:memoryuse-max=infinity: \
6565
:memoryuse-cur=infinity: \
66-
:maxproc-max=1024: \
67-
:maxproc-cur=1024: \
66+
:maxproc-max=2048: \
67+
:maxproc-cur=2048: \
6868
:openfiles-max=4096: \
6969
:openfiles-cur=4096: \
7070
:tc=default:
7171
EOLOGIN
7272
usermod -L moreres swarming
7373
syspatch
74-
# Run syspatch twice in case syspatch itself needs patching (this is the case with OpenBSD
75-
# 7.1: https://www.openbsd.org/errata71.html )
74+
# Run syspatch twice in case syspatch itself needs patching (this has been needed previously).
7675
syspatch
77-
pkg_add -iv ${PKG_ADD_OPTIONS} bash curl git python3 sudo--gettext
76+
pkg_add -iv ${PKG_ADD_OPTIONS} bash curl git python%3 sudo--gettext
7877
chown root:wheel /etc/sudoers
7978
halt -p
8079
EOF
@@ -124,7 +123,7 @@ swarming ALL=NOPASSWD:/sbin/shutdown -r now
124123
EOF
125124
chmod +x ${SITE}/install.site
126125
mkdir -p ${SITE}/usr/local/bin
127-
CGO_ENABLED=0 GOOS=openbsd GOARCH=${ARCH/i386/386} go1.21.0 build -o ${SITE}/usr/local/bin/bootstrapswarm golang.org/x/build/cmd/bootstrapswarm
126+
CGO_ENABLED=0 GOOS=openbsd GOARCH=${ARCH/i386/386} go build -o ${SITE}/usr/local/bin/bootstrapswarm golang.org/x/build/cmd/bootstrapswarm
128127
tar --mode a=rx,u=rwx --owner root:0 --group wheel:0 -C ${SITE} -zcf ${WORK}/site${RELNO}.tgz .
129128

130129
# Autoinstall script.

0 commit comments

Comments
 (0)