Add workers to Isaiah and Zeke
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
config,
|
||||||
lib,
|
lib,
|
||||||
top,
|
top,
|
||||||
...
|
...
|
||||||
@@ -6,10 +7,11 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
top.proxmox.nixosModules.proxmox-ve
|
top.buildbot.nixosModules.buildbot-worker
|
||||||
];
|
];
|
||||||
|
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
|
gitea-workerPassword.file = ../../secrets/gitea/workerPassword.age;
|
||||||
runner-reg.file = ../../secrets/gitlab/kubernetes-k3s-local.age;
|
runner-reg.file = ../../secrets/gitlab/kubernetes-k3s-local.age;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -71,6 +73,12 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
services = {
|
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
|
k3s.clusterInit = true; # This is the first node in the cluster
|
||||||
openssh = {
|
openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -8,6 +8,11 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
ip = "10.42.1.8";
|
ip = "10.42.1.8";
|
||||||
|
mk = file: {
|
||||||
|
inherit file;
|
||||||
|
owner = "buildbot";
|
||||||
|
group = "buildbot";
|
||||||
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
@@ -18,11 +23,11 @@ in
|
|||||||
];
|
];
|
||||||
|
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
gitea-buildbotWorkersFile.file = ../../secrets/gitea/buildbotWorkersFile.age;
|
gitea-buildbotWorkersFile = mk ../../secrets/gitea/buildbotWorkersFile.age;
|
||||||
gitea-oauthToken.file = ../../secrets/gitea/oauthToken.age;
|
gitea-oauthToken = mk ../../secrets/gitea/oauthToken.age;
|
||||||
gitea-oauthSecret.file = ../../secrets/gitea/oauthSecret.age;
|
gitea-oauthSecret = mk ../../secrets/gitea/oauthSecret.age;
|
||||||
gitea-webhookSecret.file = ../../secrets/gitea/webhookSecret.age;
|
gitea-webhookSecret = mk ../../secrets/gitea/webhookSecret.age;
|
||||||
gitea-workerPassword.file = ../../secrets/gitea/workerPassword.age;
|
gitea-workerPassword = mk ../../secrets/gitea/workerPassword.age;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
@@ -150,6 +155,8 @@ in
|
|||||||
#topic = "buildbot-greg";
|
#topic = "buildbot-greg";
|
||||||
webhookSecretFile = config.age.secrets.gitea-webhookSecret.path;
|
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;
|
workersFile = config.age.secrets.gitea-buildbotWorkersFile.path;
|
||||||
};
|
};
|
||||||
worker = {
|
worker = {
|
||||||
|
|||||||
@@ -11,8 +11,13 @@
|
|||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
# ./virt.nix
|
# ./virt.nix
|
||||||
top.nix-hardware.nixosModules.system76
|
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 ];
|
boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
|
||||||
|
|
||||||
greg = {
|
greg = {
|
||||||
@@ -58,6 +63,12 @@
|
|||||||
|
|
||||||
# Let's do a sound thing
|
# Let's do a sound thing
|
||||||
services = {
|
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 = {
|
k3s = {
|
||||||
extraFlags = [
|
extraFlags = [
|
||||||
"--tls-san 10.42.1.13"
|
"--tls-san 10.42.1.13"
|
||||||
|
|||||||
Reference in New Issue
Block a user