Skip to content

Commit 8fe6b21

Browse files
committed
trim down build role
1 parent d8f09b6 commit 8fe6b21

8 files changed

Lines changed: 35 additions & 133 deletions

File tree

ansible/build.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,16 @@
22
- hosts: buildmaster
33
become: yes
44
become_user: root
5-
become_method: sudo
5+
become_method: su
66
roles:
7-
- acmetool
87
- buildmaster
98
- root-mirror-shim
109
- void-updates
11-
- live-mirror
12-
- sources_site
13-
- xq-api
1410

1511
- hosts: buildslave
1612
become: yes
1713
become_user: root
18-
become_method: sudo
14+
become_method: su
1915
roles:
2016
- buildslave
2117
- btimefiles

ansible/host_vars/ansi.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
xbps_repository_main: /data/pkgs
3+
xbps_repository_nonfree: /data/pkgs/nonfree
4+
xbps_repository_multilib: /data/pkgs/multilib
5+
xbps_repository_multilib_nonfree: /data/pkgs/multilib/nonfree
6+
7+
sshd_AllowGroups:
8+
- build-ops
9+
- void-buildsync
10+
11+
buildslave_zone: DE-1
12+
13+
nomad_host_volumes:
14+
- name: void-packages
15+
path: /data/void-packages
16+
read_only: false
17+
- name: root-pkgs
18+
path: /hostdir/binpkgs
19+
read_only: false
20+
- name: glibc_hostdir
21+
path: /hostdir
22+
read_only: false

ansible/inventory

Lines changed: 2 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,9 @@
11
[buildmaster]
2-
a-hel-fi.m.voidlinux.org
2+
ansi
33

44
[buildslave]
5-
a-hel-fi.m.voidlinux.org
6-
c-lej-de.m.voidlinux.org
7-
a-fsn-de.m.voidlinux.org
5+
ansi
86

97
[build:children]
108
buildmaster
119
buildslave
12-
13-
[docs]
14-
a-hel-fi.m.voidlinux.org
15-
16-
[man]
17-
a-hel-fi.m.voidlinux.org
18-
19-
[popcorn]
20-
a-hel-fi.m.voidlinux.org
21-
22-
[mirrormanager]
23-
a-hel-fi.m.voidlinux.org
24-
25-
[netauth]
26-
a-sfo3-us.m.voidlinux.org
27-
28-
[netlogon]
29-
vm1.a-mci-us.m.voidlinux.org
30-
a-hel-fi.m.voidlinux.org
31-
b-hel-fi.m.voidlinux.org
32-
a-fsn-de.m.voidlinux.org
33-
b-lej-de.m.voidlinux.org
34-
c-lej-de.m.voidlinux.org
35-
a-sfo3-us.m.voidlinux.org
36-
b-sfo3-us.m.voidlinux.org
37-
c-sfo3-us.m.voidlinux.org
38-
d-sfo3-us.m.voidlinux.org
39-
e-sfo3-us.m.voidlinux.org
40-
f-sfo3-us.m.voidlinux.org
41-
a-mci-us.m.voidlinux.org
42-
43-
[hashi:children]
44-
hashimaster
45-
hashiworker
46-
hashiproxy
47-
hashimirror
48-
hashimx
49-
50-
[hashimaster]
51-
b-sfo3-us.m.voidlinux.org
52-
c-sfo3-us.m.voidlinux.org
53-
d-sfo3-us.m.voidlinux.org
54-
55-
[hashiworker]
56-
a-hel-fi.m.voidlinux.org
57-
a-fsn-de.m.voidlinux.org
58-
b-lej-de.m.voidlinux.org
59-
c-lej-de.m.voidlinux.org
60-
61-
[hashiproxy]
62-
e-sfo3-us.m.voidlinux.org
63-
64-
[hashimirror]
65-
b-hel-fi.m.voidlinux.org
66-
a-mci-us.m.voidlinux.org
67-
68-
[hashimx]
69-
f-sfo3-us.m.voidlinux.org
70-
71-
[unmanaged]
72-
a-lej-de.m.voidlinux.org
73-
74-
[prod]
75-
a-hel-fi.m.voidlinux.org
76-
b-hel-fi.m.voidlinux.org
77-
a-mci-us.m.voidlinux.org
78-
a-fsn-de.m.voidlinux.org
79-
a-lej-de.m.voidlinux.org
80-
b-lej-de.m.voidlinux.org
81-
c-lej-de.m.voidlinux.org
82-
a-sfo3-us.m.voidlinux.org
83-
b-sfo3-us.m.voidlinux.org
84-
c-sfo3-us.m.voidlinux.org
85-
d-sfo3-us.m.voidlinux.org
86-
e-sfo3-us.m.voidlinux.org
87-
f-sfo3-us.m.voidlinux.org

ansible/roles/buildmaster/tasks/buildbot.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
virtualenv: "/{{ buildmaster_rootdir }}/virtual_builder"
2929
virtualenv_python: python2
3030
become_user: "{{ buildmaster_user }}"
31-
become_method: sudo
31+
become_method: doas
3232

3333
- name: Make Buildbot More Terse
3434
patch:
@@ -71,15 +71,6 @@
7171
group: "{{ buildmaster_user }}"
7272
mode: 0644
7373

74-
- name: Install GitHub Webhook Password
75-
copy:
76-
src: secret/buildmaster_github_webhook_passwd
77-
dest: "/{{ buildmaster_rootdir }}/github-webhook.passwd"
78-
owner: "{{ buildmaster_user }}"
79-
group: "{{ buildmaster_user }}"
80-
mode: 0400
81-
no_log: True
82-
8374
- name: Configure BuildMaster
8475
template:
8576
src: master.cfg.j2

ansible/roles/buildmaster/tasks/pre.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,3 @@
33
group:
44
name: void-repo
55
state: present
6-
7-
- name: Install the buildmaster firewall rules
8-
copy:
9-
src: buildmaster.rules
10-
dest: /etc/iptables.d
11-
owner: root
12-
group: root
13-
mode: 0640
14-
notify:
15-
- iptables
16-
17-
- name: Install the buildmaster firewall rules (v6)
18-
copy:
19-
src: buildmaster.6rules
20-
dest: /etc/ip6tables.d
21-
owner: root
22-
group: root
23-
mode: 0640
24-
notify:
25-
- iptables

ansible/roles/buildmaster/tasks/www.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,3 @@
2121
owner: root
2222
group: root
2323
mode: 0644
24-
notify:
25-
- nginx

ansible/roles/buildmaster/templates/master.cfg.j2

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ from buildbot.status.web import authz, auth
2222
from buildbot.status import words
2323
from buildbot.status import results
2424
from buildbot.status.results import SUCCESS, FAILURE, WARNINGS
25+
from buildbot.plugins import changes
2526

2627
import user_settings
2728
from ShellCommandChangeList import ShellCommandChangeList
@@ -192,23 +193,15 @@ authz_cfg=authz.Authz(
192193
c['status'] = [
193194
html.WebStatus(
194195
http_port=8010, authz=authz_cfg, order_console_by_time=True,
195-
change_hook_dialects={ 'github' : {
196-
'secret': '{{ buildmaster_github_secret }}',
197-
'strict': True
198-
}
199-
},
200-
change_hook_auth=["file:/{{ buildmaster_rootdir}}/github-webhook.passwd"]
201196
),
202-
words.IRC(
203-
host='irc.libera.chat',
204-
nick='void-builder',
205-
password='{{ buildmaster_irc_password }}',
206-
channels=[{'channel': '#xbps'}],
207-
notify_events={ 'failure' : 1 },
208-
noticeOnChannel=True, useRevisions=True
209-
)
210197
]
211198

199+
c['change_source'] = changes.GitPoller(
200+
repourl='https://github.com/void-linux/void-packages.git',
201+
branches=['master'],
202+
pollInterval=120,
203+
)
204+
212205
c['title'] = proj
213206
c['titleURL'] = 'http://www.voidlinux.org/'
214207
c['buildbotURL'] = 'https://build.voidlinux.org/'

ansible/roles/buildslave/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ buildslave_rootdir: /home/void-buildslave/
3131
# all locations for consistency. If persistent resolution issues are
3232
# preventing a host from connecting to the buildmaster this name
3333
# should very likely be specified in the hosts file.
34-
buildslave_master: build.voidlinux.org
34+
buildslave_master: localhost
3535

3636
# The following list contains hashes for the builders. For standards
3737
# and sake of debugging, the 'mach' should be the architecture as

0 commit comments

Comments
 (0)