Skip to content

Commit d618c0e

Browse files
classabbyampthe-maldridge
authored andcommitted
services/nomad/build/buildbot: use local repos
xbps-checkvers doesn't work with remote repos (as are in the default conf) and we should be using local repos anyways. Closes: #215 [via git-merge-pr]
1 parent 0736fe6 commit d618c0e

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

services/nomad/build/buildbot-worker.nomad

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ job "buildbot-worker" {
7272

7373
config {
7474
image = "ghcr.io/void-linux/infra-buildbot-builder:20240928R1"
75+
volumes = [ "local/xbps-repos.conf:/usr/share/xbps.d/00-repository-main.conf" ]
7576
cap_add = ["sys_admin"]
7677
}
7778

@@ -130,6 +131,20 @@ EOF
130131
destination = "local/info/host"
131132
}
132133

134+
template {
135+
data = <<EOF
136+
repository=/hostdir/binpkgs/bootstrap
137+
repository=/hostdir/binpkgs
138+
repository=/hostdir/binpkgs/nonfree
139+
{{ if eq "${group.value.name}" "glibc" }}
140+
repository=/hostdir/binpkgs/multilib/bootstrap
141+
repository=/hostdir/binpkgs/multilib
142+
repository=/hostdir/binpkgs/multilib/nonfree
143+
{{ end }}
144+
EOF
145+
destination = "local/xbps-repos.conf"
146+
}
147+
133148
template {
134149
data = <<EOF
135150
{{- with nomadVar "nomad/jobs/buildbot-worker" -}}

services/nomad/build/buildbot.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@ def make_xbps_bulk_cmd(props):
164164
if props.getProperty('cross') == 'True':
165165
command += ['-a', props.getProperty('target')]
166166
else:
167-
command += ['-a', 'native-', props.getProperty('host')]
167+
command += ['-a', 'native-' + props.getProperty('host')]
168+
command += ['--']
168169

169170
return command
170171

0 commit comments

Comments
 (0)