From b50b9ededabc02191765dd163ab317431fef7bc5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 25 Nov 2023 10:19:06 +1000
Subject: [PATCH 1/2] remove unused plugins

---
 nix/master.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/nix/master.nix b/nix/master.nix
index 6d6f0e2..20feac5 100644
--- a/nix/master.nix
+++ b/nix/master.nix
@@ -129,7 +129,7 @@ in
       extraConfig = ''
         c["www"]["plugins"] = c["www"].get("plugins", {})
         c["www"]["plugins"].update(
-            dict(base_react={}, waterfall_view={}, console_view={}, grid_view={})
+            dict(base_react={})
         )
         ${lib.optionalString (cfg.prometheusExporterPort != null) ''
           c['services'].append(reporters.Prometheus(port=${builtins.toString cfg.prometheusExporterPort}))
@@ -170,13 +170,7 @@ in
         ps.treq
         ps.psycopg2
         (ps.toPythonModule pkgs.buildbot-worker)
-        pkgs.buildbot-plugins.www
         pkgs.buildbot-plugins.www-react
-        pkgs.buildbot-plugins.console-view
-        pkgs.buildbot-plugins.waterfall-view
-        pkgs.buildbot-plugins.grid-view
-        pkgs.buildbot-plugins.wsgi-dashboards
-        pkgs.buildbot-plugins.badges
         (pkgs.python3.pkgs.callPackage ../default.nix { })
       ] ++ lib.optional (cfg.prometheusExporterPort != null)
         (ps.buildPythonPackage rec {

From e4965e5540fcf29a035af544aa3b420406bf494d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 30 Nov 2023 09:14:19 +0100
Subject: [PATCH 2/2] worker: don't kill service when a process takes too much
 RAM

---
 nix/worker.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nix/worker.nix b/nix/worker.nix
index 2fdf3eb..37c7f8c 100644
--- a/nix/worker.nix
+++ b/nix/worker.nix
@@ -66,6 +66,10 @@ in
       environment.BUILDBOT_DIR = buildbotDir;
 
       serviceConfig = {
+        # We rather want the CI job to fail on OOM than to have a broken buildbot worker.
+        # Otherwise we might end up restarting the worker and the same job is run again.
+        OOMPolicy = "continue";
+
         LoadCredential = [ "worker-password-file:${cfg.workerPasswordFile}" ];
         Environment = [ "WORKER_PASSWORD_FILE=%d/worker-password-file" ];
         Type = "simple";