wip

services/nomad/build/buildbot.cfg

@@ -3,6 +3,7 @@
 import configparser
 import json
 import shlex
+from pathlib import Path
 
 from twisted.internet import defer
 
@@ -17,20 +18,7 @@ with open(ini['buildbot'].get('workers', '/local/workers.json')) as f:
     workers = js.get("workers", [])
     builders = js.get("builders", [])
 
-# TODO
-userInfoProvider = util.LdapUserInfo(
-    uri='ldap://localhost:389',
-    bindUser='',
-    bindPw='',
-    accountBase='ou=entities,dc=netauth,dc=voidlinux,dc=org',
-    accountPattern='(uid=%(username)s)',
-    accountFullName='displayname',
-    accountEmail='mail',
-    groupBase='ou=groups,dc=netauth,dc=voidlinux,dc=org',
-    groupMemberPattern='',
-    groupName='',
-)
-auth = util.RemoteUserAuth(userInfoProvider=userInfoProvider)
+netauth = util.BuildbotNetAuth(conf=Path("/etc/netauth/config.toml"))
 authz = util.Authz(
     allowRules=[
         util.AnyEndpointMatcher(role="ops", defaultDeny=False),
@@ -65,10 +53,10 @@ c = BuildmasterConfig = {
             },
         },
         'avatar_methods': [
-            util.AvatarGitHub(), util.AvatarGravatar(),
+            netauth, util.AvatarGitHub(), util.AvatarGravatar(),
         ],
         'authz': authz,
-        'auth': auth,
+        'auth': netauth,
         'ui_default_config': {
             'Waterfall.number_background_waterfall': True,
             'Waterfall.show_builders_without_builds': True,

services/nomad/build/buildbot.nomad

@@ -21,6 +21,12 @@ job "buildbot" {
       read_only = false
     }
 
+    volume "netauth_config" {
+      type = "host"
+      read_only = true
+      source = "netauth_config"
+    }
+
     service {
       // TODO: can't be nomad with meta {}
       provider = "nomad"
@@ -68,6 +74,12 @@ job "buildbot" {
         destination = "/db"
       }
 
+      volume_mount {
+        volume = "netauth_config"
+        destination = "/etc/netauth"
+        read_only = true
+      }
+
       template {
         data = <<EOF
 [buildbot]
@@ -81,7 +93,7 @@ host = irc.libera.chat
 # TODO
 # nick = void-builder
 # channel = #xbps
-# authz = duncaen maldridge
+# authz = duncaen maldridge abby
 nick = abby-testbot
 channel = ###abby-testbot
 authz = duncaen maldridge abby

services/pkg/buildbot-builder/buildbot.tac

@@ -1,3 +1,4 @@
+# vim: set filetype=python:
 
 import os
 import configparser

services/pkg/buildbot/Dockerfile

@@ -4,7 +4,9 @@ RUN xbps-install -Suy xbps && xbps-install -uy python3 tini git curl
 # version must be synced with ../buildbot-worker
 RUN python3 -m venv /venv && \
 	/venv/bin/pip3 install wheel && \
-	/venv/bin/pip3 install 'buildbot[tls,bundle]~=4.0.0' treq ldap3
+	/venv/bin/pip3 install 'buildbot[tls,bundle]~=4.0.0' treq \
+	    'git+https://github.com/classabbyamp/netauth-python.git' \
+        'git+https://github.com/classabbyamp/buildbot-netauth.git'
 WORKDIR /buildbot
 COPY buildbot.tac /buildbot/
 COPY run.sh /

services/pkg/buildbot/buildbot.tac

@@ -1,3 +1,5 @@
+# vim: set filetype=python:
+
 import os
 import sys