@@ -9,8 +9,8 @@ job "buildbot-worker" {
99 // memory is ~90% of capacity
1010 // memory_max is ~95% of capacity
1111 { name = " glibc" , jobs = 10 , cpu = 38100 , mem = 115840 , mem_max = 122270 },
12- { name = " musl" , jobs = 6 , cpu = 21700 , mem = 57690 , mem_max = 60890 },
13- { name = " aarch64" , jobs = 6 , cpu = 12000 , mem = 28500 , mem_max = 30500 },
12+ { name = " musl" , jobs = 6 , cpu = 12000 , mem = 28500 , mem_max = 30500 },
13+ { name = " aarch64" , jobs = 12 , cpu = 16000 , mem = 27500 , mem_max = 29500 },
1414 ]
1515 labels = [ " buildbot-worker-${ group . value . name } " ]
1616
@@ -160,22 +160,21 @@ EOF
160160 destination = " local/info/host"
161161 }
162162
163- // the builders should use local repos
164- // except for aarch64, which must be able to get hostmakedepends from repo-default
163+ // the builders should use the internal mirror
165164 template {
166165 data = << EOF
167- repository=/hostdir/binpkgs/bootstrap
168- repository=/hostdir/binpkgs
169- repository=/hostdir/binpkgs/nonfree
170- {{ if eq "${ group . value . name } " "glibc" }}
171- repository=/hostdir/binpkgs/multilib/bootstrap
172- repository=/hostdir/binpkgs/multilib
173- repository=/hostdir/binpkgs/multilib/nonfree
174- {{ end }}
175- {{ if eq "${ group . value . name } " "aarch64" }}
176166{{ range service "root-pkgs-internal" }}
167+ {{ if eq "${ group . value . name } " "glibc" }}
168+ repository=http://{{ .Address }}:{{ .Port }}/bootstrap
177169repository=http://{{ .Address }}:{{ .Port }}
178- repository=http://{{ .Address }}:{{ .Port }}/musl
170+ repository=http://{{ .Address }}:{{ .Port }}/nonfree
171+ repository=http://{{ .Address }}:{{ .Port }}/multilib/bootstrap
172+ repository=http://{{ .Address }}:{{ .Port }}/multilib
173+ repository=http://{{ .Address }}:{{ .Port }}/multilib/nonfree
174+ {{ else }}
175+ repository=http://{{ .Address }}:{{ .Port }}/${ group . value . name } /bootstrap
176+ repository=http://{{ .Address }}:{{ .Port }}/${ group . value . name }
177+ repository=http://{{ .Address }}:{{ .Port }}/${ group . value . name } /nonfree
179178{{ end }}
180179{{ end }}
181180EOF
205204 template {
206205 data = << EOF
207206{{- with nomadVar "nomad/jobs/buildsync" -}}
208- {{ .${ group . value . name } _password }}
207+ {{ .password }}
209208{{- end -}}
210209EOF
211210 destination = " secrets/rsync/password"
0 commit comments