Skip to content

Commit f71bdbc

Browse files
classabbyampthe-maldridge
authored andcommitted
services/nomad/build/buildbot-worker: add repo-default on aarch64, mask xbps-arch.conf
needed for hostmakedepends, because there is no local repo for that /usr/share/xbps.d/xbps-arch.conf prevents xbps-checkvers from working correctly, so mask it with an empty file
1 parent d618c0e commit f71bdbc

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

services/nomad/build/buildbot-worker.nomad

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ 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" ]
75+
volumes = [
76+
"local/xbps-repos.conf:/etc/xbps.d/00-repository-main.conf",
77+
"local/xbps-arch.conf:/etc/xbps.d/xbps-arch.conf",
78+
]
7679
cap_add = ["sys_admin"]
7780
}
7881

@@ -131,6 +134,8 @@ EOF
131134
destination = "local/info/host"
132135
}
133136

137+
// the builders should use local repos
138+
// except for aarch64, which must be able to get hostmakedepends from repo-default
134139
template {
135140
data = <<EOF
136141
repository=/hostdir/binpkgs/bootstrap
@@ -141,10 +146,22 @@ repository=/hostdir/binpkgs/multilib/bootstrap
141146
repository=/hostdir/binpkgs/multilib
142147
repository=/hostdir/binpkgs/multilib/nonfree
143148
{{ end }}
149+
{{ if eq "${group.value.name}" "aarch64" }}
150+
repository=https://repo-default.voidlinux.org/current
151+
repository=https://repo-default.voidlinux.org/current/musl
152+
{{ end }}
144153
EOF
145154
destination = "local/xbps-repos.conf"
146155
}
147156

157+
// /usr/share/xbps.d/xbps-arch.conf will mess up xbps-checkvers, so mask it with an empty file
158+
template {
159+
data = <<EOF
160+
# this file intentionally left blank
161+
EOF
162+
destination = "local/xbps-arch.conf"
163+
}
164+
148165
template {
149166
data = <<EOF
150167
{{- with nomadVar "nomad/jobs/buildbot-worker" -}}

0 commit comments

Comments
 (0)