From ebea10d242383fbb5d0c5f904e64f9358635213d Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Tue, 1 Aug 2023 16:48:49 +0200 Subject: [PATCH] added buildbot workers --- configurations.nix | 1 + hosts/epyc.nix | 2 ++ modules/buildbot/default.nix | 4 ++-- modules/buildbot/worker.py | 5 ++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/configurations.nix b/configurations.nix index 550d0fd..f14c0a0 100644 --- a/configurations.nix +++ b/configurations.nix @@ -36,6 +36,7 @@ let ./modules/network.nix ./modules/zsh.nix ./modules/ssh-cursed.nix + ./modules/buildbot disko.nixosModules.disko diff --git a/hosts/epyc.nix b/hosts/epyc.nix index 805fa33..b41c69a 100644 --- a/hosts/epyc.nix +++ b/hosts/epyc.nix @@ -18,6 +18,8 @@ }; }; + boot.binfmt.emulatedSystems = [ "aarch64-linux" "riscv64-linux" ]; + simd.arch = "znver3"; system.stateVersion = "23.05"; } diff --git a/modules/buildbot/default.nix b/modules/buildbot/default.nix index 5b0caa5..3691eab 100644 --- a/modules/buildbot/default.nix +++ b/modules/buildbot/default.nix @@ -28,14 +28,14 @@ in after = [ "network.target" "buildbot-master.service" ]; wantedBy = [ "multi-user.target" ]; path = [ - pkgs.unstable.nix-eval-jobs + pkgs.nix-eval-jobs pkgs.git pkgs.gh pkgs.nix pkgs.nix-output-monitor ]; environment.PYTHONPATH = "${python.withPackages (_: [package])}/${python.sitePackages}"; - environment.MASTER_URL = ''tcp:host=ci.julienmalka.me''; + environment.MASTER_URL = ''TCP:2a01\\:e34\\:ec2a\\:8e60\\:8ec7\\:b5d2\\:f663\\:a67a:9989''; environment.BUILDBOT_DIR = buildbotDir; environment.WORKER_PASSWORD_FILE = "/var/lib/buildbot-worker/password.txt"; diff --git a/modules/buildbot/worker.py b/modules/buildbot/worker.py index a640eff..198dfae 100644 --- a/modules/buildbot/worker.py +++ b/modules/buildbot/worker.py @@ -34,13 +34,12 @@ def setup_worker(application: service.Application, id: int) -> None: allow_shutdown = None s = Worker( - None, - None, + "2a01:e34:ec2a:8e60:8ec7:b5d2:f663:a67a", + 9989, workername, passwd, basedir, keepalive, - connection_string=master_url, umask=umask, maxdelay=maxdelay, numcpus=numcpus,