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

buildbot 4.2 updates #220

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

buildbot 4.2 updates #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c837c0f
services/pkg/buildbot{,-builder}: update to buildbot 4.2.0
classabbyamp Nov 13, 2024
399c550
services/nomad/buildbot: update config to split logs per-package
classabbyamp Nov 13, 2024
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
20 changes: 7 additions & 13 deletions services/nomad/build/buildbot.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,19 +184,13 @@ class ShellCommandWithChanges(steps.ShellCommand):

@util.renderer
def build_packages(props):
# if a better solver is written
# cmds = []
# for p in str(props.getProperty('packages')).strip().split():
# cmds.append(util.ShellArg(
# command=['make', f'built/{p}'],
# logname=f'pkg:{p}',
# haltOnFailure=True,
# ))
cmds = [util.ShellArg(
command=['make', 'all'],
logname='build',
haltOnFailure=True,
)]
cmds = []
for p in str(props.getProperty('packages')).strip().split():
cmds.append(util.ShellArg(
command=['make', f'built/{p}'],
logname=f'pkg:{p}',
haltOnFailure=True,
))
if cmds:
cmds.append(util.ShellArg(
command=['make', 'clean'],
Expand Down
13 changes: 9 additions & 4 deletions services/pkg/buildbot-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
FROM ghcr.io/void-linux/void-glibc-full:20240526R1 AS build
FROM ghcr.io/void-linux/void-glibc-full:latest AS build

RUN xbps-install -Suy xbps && xbps-install -uy git go
ARG GO_XBPS_SRC_VERSION=4c394976975f7e84062f56d437b41a0d48043792

ARG GO_XBPS_SRC_VERSION=0411f1b69a21103ec39ae6b0160b47cfc2c3e880

RUN env GOBIN=/usr/local/bin GOMODCACHE=/tmp/go \
go install -v github.com/Duncaen/go-xbps-src/cmd/xbps-src-make@$GO_XBPS_SRC_VERSION

FROM build AS buildbot-builder
RUN xbps-install -Suy xbps && xbps-install -uy python3 tini git curl bash make rsync
COPY --from=build /usr/local/bin/xbps-src-make /usr/local/bin/xbps-src-make
RUN rm -rf /var/cache/xbps && \
RUN rm -rf /var/cache/xbps /tmp/* && \
groupadd --gid 418 void-builder && \
useradd --uid 418 --gid 418 -G xbuilder -M -d /buildbot void-builder && \
mkdir /venv /buildbot && \
chown void-builder:void-builder /venv /buildbot
USER void-builder

# version must be synced with ../buildbot
ARG BUILDBOT_VERSION=4.2.0

RUN python3 -m venv /venv && \
/venv/bin/pip3 install wheel && \
/venv/bin/pip3 install 'buildbot-worker~=4.0.0'
/venv/bin/pip3 install 'buildbot-worker~='$BUILDBOT_VERSION
WORKDIR /buildbot
RUN mkdir -p /buildbot && \
ln -sf /local/info /buildbot/info && \
Expand Down
11 changes: 7 additions & 4 deletions services/pkg/buildbot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
FROM ghcr.io/void-linux/void-glibc-full:20240526R1
FROM ghcr.io/void-linux/void-glibc-full:latest

RUN xbps-install -Suy xbps && xbps-install -uy python3 tini git curl && rm -rf /var/cache/xbps /tmp/*

RUN xbps-install -Suy xbps && xbps-install -uy python3 tini git curl
ARG THEME_VERSION=v0.1.0
# version must be synced with ../buildbot-worker
ARG BUILDBOT_VERSION=4.2.0
ARG THEME_VERSION=v0.1.0

RUN python3 -m venv /venv && \
/venv/bin/pip3 install wheel && \
/venv/bin/pip3 install 'buildbot[tls,bundle]~=4.0.0' treq \
/venv/bin/pip3 install 'buildbot[tls,bundle]~='$BUILDBOT_VERSION \
buildbot-prometheus buildbot-netauth \
git+https://github.com/void-linux/buildbot-theme.git@$THEME_VERSION
WORKDIR /buildbot
Expand Down
Loading