Skip to content

Commit 1534a8f

Browse files
classabbyampthe-maldridge
authored andcommitted
services/nomad/buildbot*: split x86_64-glibc into its own builder
Closes: #268 [via git-merge-pr]
1 parent 8ab15e1 commit 1534a8f

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

services/nomad/build/buildbot-worker.nomad

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ 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 = "x86_64-glibc", jobs = 8, cpu = 15000, mem = 14000, mem_max = 15000 },
1213
{ name = "musl", jobs = 6, cpu = 21700, mem = 57690, mem_max = 60890 },
1314
{ name = "aarch64", jobs = 6, cpu = 12000, mem = 28500, mem_max = 30500 },
1415
]
@@ -164,7 +165,7 @@ EOF
164165
template {
165166
data = <<EOF
166167
{{ range service "root-pkgs-internal" }}
167-
{{ if eq "${group.value.name}" "glibc" }}
168+
{{ if "${group.value.name}" | regexMatch ".*glibc" }}
168169
repository=http://{{ .Address }}:{{ .Port }}/bootstrap
169170
repository=http://{{ .Address }}:{{ .Port }}
170171
repository=http://{{ .Address }}:{{ .Port }}/nonfree

services/nomad/build/buildbot.nomad

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,13 @@ EOF
102102
template {
103103
data = jsonencode({
104104
workers = [
105-
{ name = "glibc", max-builds = 4 },
105+
{ name = "glibc", max-builds = 3 },
106+
{ name = "x86_64-glibc", max-builds = 1 },
106107
{ name = "musl", max-builds = 3 },
107108
{ name = "aarch64", max-builds = 2 },
108109
],
109110
builders = [
110-
{ name = "x86_64", host = "x86_64", worker = "glibc", },
111+
{ name = "x86_64", host = "x86_64", worker = "x86_64-glibc", },
111112
{ name = "i686", host = "i686", worker = "glibc", },
112113
{ name = "armv7l", host = "x86_64", target = "armv7l", worker = "glibc", },
113114
{ name = "armv6l", host = "x86_64", target = "armv6l", worker = "glibc", },

0 commit comments

Comments
 (0)