Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 20 additions & 0 deletions ansible/host_vars/a-nbg-de.m.voidlinux.org.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,23 @@ network_static_interfaces:

sshd_AllowGroups:
- build-ops

buildworker_archs:
- x86_64

nomad_meta:
builder: "true"

nomad_host_volumes:
- name: x86_64-glibc_hostdir
path: /hostdir
read_only: false
- name: x86_64-glibc_workdir
path: /workdir
read_only: false
- name: x86_64-glibc_buildrootdir
path: /buildroot
read_only: false
- name: ccache
path: /hostdir/ccache
read_only: true
1 change: 1 addition & 0 deletions ansible/inventory
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
a-hel-fi.m.voidlinux.org
a-fsn-de.m.voidlinux.org
b-fsn-de.m.voidlinux.org
a-nbg-de.m.voidlinux.org

[root_mirror]
a-fsn-de.m.voidlinux.org
Expand Down
1 change: 1 addition & 0 deletions ansible/roles/nomad_client/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
mode: "0644"
vars:
nomad_retry_join_servers: "{{ groups['hashimaster'] | map('extract', void_mesh) | list | sort }}"
tags: [configure_nomad_client]
notify:
- nomad

Expand Down
3 changes: 2 additions & 1 deletion services/nomad/build/buildbot-worker.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ job "buildbot-worker" {
// memory is ~90% of capacity
// memory_max is ~95% of capacity
{ name = "glibc", jobs = 10, cpu = 38100, mem = 115840, mem_max = 122270 },
{ name = "x86_64-glibc", jobs = 8, cpu = 15000, mem = 14000, mem_max = 15000 },
{ name = "musl", jobs = 6, cpu = 21700, mem = 57690, mem_max = 60890 },
{ name = "aarch64", jobs = 6, cpu = 12000, mem = 28500, mem_max = 30500 },
]
Expand Down Expand Up @@ -164,7 +165,7 @@ EOF
template {
data = <<EOF
{{ range service "root-pkgs-internal" }}
{{ if eq "${group.value.name}" "glibc" }}
{{ if "${group.value.name}" | regexMatch ".*glibc" }}
repository=http://{{ .Address }}:{{ .Port }}/bootstrap
repository=http://{{ .Address }}:{{ .Port }}
repository=http://{{ .Address }}:{{ .Port }}/nonfree
Expand Down
5 changes: 3 additions & 2 deletions services/nomad/build/buildbot.nomad
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,13 @@ EOF
template {
data = jsonencode({
workers = [
{ name = "glibc", max-builds = 4 },
{ name = "glibc", max-builds = 3 },
{ name = "x86_64-glibc", max-builds = 1 },
{ name = "musl", max-builds = 3 },
{ name = "aarch64", max-builds = 2 },
],
builders = [
{ name = "x86_64", host = "x86_64", worker = "glibc", },
{ name = "x86_64", host = "x86_64", worker = "x86_64-glibc", },
{ name = "i686", host = "i686", worker = "glibc", },
{ name = "armv7l", host = "x86_64", target = "armv7l", worker = "glibc", },
{ name = "armv6l", host = "x86_64", target = "armv6l", worker = "glibc", },
Expand Down