diff --git a/hosts/isaiah/default.nix b/hosts/isaiah/default.nix index b4c862d..ed05370 100644 --- a/hosts/isaiah/default.nix +++ b/hosts/isaiah/default.nix @@ -1,4 +1,5 @@ { + config, lib, top, ... @@ -6,10 +7,11 @@ { imports = [ ./hardware-configuration.nix - top.proxmox.nixosModules.proxmox-ve + top.buildbot.nixosModules.buildbot-worker ]; age.secrets = { + gitea-workerPassword.file = ../../secrets/gitea/workerPassword.age; runner-reg.file = ../../secrets/gitlab/kubernetes-k3s-local.age; }; @@ -71,6 +73,12 @@ }; services = { + buildbot-nix.worker = { + enable = true; + masterUrl = "tcp:host=jeremiah.shire-zebra.ts.net:port=9989"; + name = "isaiah"; + workerPasswordFile = config.age.secrets.gitea-workerPassword.path; + }; k3s.clusterInit = true; # This is the first node in the cluster openssh = { enable = true; diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix index da4eac8..e5691f5 100644 --- a/hosts/jeremiah/default.nix +++ b/hosts/jeremiah/default.nix @@ -8,6 +8,11 @@ let ip = "10.42.1.8"; + mk = file: { + inherit file; + owner = "buildbot"; + group = "buildbot"; + }; in { imports = [ @@ -18,11 +23,11 @@ in ]; age.secrets = { - gitea-buildbotWorkersFile.file = ../../secrets/gitea/buildbotWorkersFile.age; - gitea-oauthToken.file = ../../secrets/gitea/oauthToken.age; - gitea-oauthSecret.file = ../../secrets/gitea/oauthSecret.age; - gitea-webhookSecret.file = ../../secrets/gitea/webhookSecret.age; - gitea-workerPassword.file = ../../secrets/gitea/workerPassword.age; + gitea-buildbotWorkersFile = mk ../../secrets/gitea/buildbotWorkersFile.age; + gitea-oauthToken = mk ../../secrets/gitea/oauthToken.age; + gitea-oauthSecret = mk ../../secrets/gitea/oauthSecret.age; + gitea-webhookSecret = mk ../../secrets/gitea/webhookSecret.age; + gitea-workerPassword = mk ../../secrets/gitea/workerPassword.age; }; # Bootloader. @@ -150,6 +155,8 @@ in #topic = "buildbot-greg"; webhookSecretFile = config.age.secrets.gitea-webhookSecret.path; }; + showTrace = true; + #webhookBaseUrl = "http://${config.networking.hostName}.shire-zebra.ts.net:8010"; workersFile = config.age.secrets.gitea-buildbotWorkersFile.path; }; worker = { diff --git a/hosts/zeke/default.nix b/hosts/zeke/default.nix index 03f5037..296a382 100644 --- a/hosts/zeke/default.nix +++ b/hosts/zeke/default.nix @@ -11,8 +11,13 @@ ./hardware-configuration.nix # ./virt.nix top.nix-hardware.nixosModules.system76 + top.buildbot.nixosModules.buildbot-worker ]; + age.secrets = { + gitea-workerPassword.file = ../../secrets/gitea/workerPassword.age; + }; + boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ]; greg = { @@ -58,6 +63,12 @@ # Let's do a sound thing services = { + buildbot-nix.worker = { + enable = true; + masterUrl = "tcp:host=jeremiah.shire-zebra.ts.net:port=9989"; + name = "zeke"; + workerPasswordFile = config.age.secrets.gitea-workerPassword.path; + }; k3s = { extraFlags = [ "--tls-san 10.42.1.13"