From a554531e28e7b21a27504333a7d950492c26c267 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 27 Nov 2023 11:44:06 +0300 Subject: chore(ops): move from gerrit-queue to gerrit-autosubmit Enables the new autosubmit bot, albeit without rebase functionality (this will be a separate change). Change-Id: Ia42a4f08c0edca5e6cc8bf4770ec24dbf16a5db7 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10132 Reviewed-by: sterni Tested-by: BuildkiteCI Autosubmit: tazjin --- ops/machines/whitby/default.nix | 7 +++-- ops/modules/gerrit-autosubmit.nix | 42 ++++++++++++++++++++++++++++++ ops/modules/gerrit-queue.nix | 52 -------------------------------------- ops/secrets/gerrit-autosubmit.age | Bin 0 -> 853 bytes ops/secrets/gerrit-queue.age | Bin 853 -> 0 bytes ops/secrets/secrets.nix | 2 +- 6 files changed, 46 insertions(+), 57 deletions(-) create mode 100644 ops/modules/gerrit-autosubmit.nix delete mode 100644 ops/modules/gerrit-queue.nix create mode 100644 ops/secrets/gerrit-autosubmit.age delete mode 100644 ops/secrets/gerrit-queue.age (limited to 'ops') diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix index d341ed0cec..d57f769826 100644 --- a/ops/machines/whitby/default.nix +++ b/ops/machines/whitby/default.nix @@ -12,7 +12,7 @@ in (mod "atward.nix") (mod "cgit.nix") (mod "clbot.nix") - (mod "gerrit-queue.nix") + (mod "gerrit-autosubmit.nix") (mod "irccat.nix") (mod "josh.nix") (mod "journaldriver.nix") @@ -224,7 +224,7 @@ in in { clbot.file = secretFile "clbot"; - gerrit-queue.file = secretFile "gerrit-queue"; + gerrit-autosubmit.file = secretFile "gerrit-autosubmit"; grafana.file = secretFile "grafana"; irccat.file = secretFile "irccat"; keycloak-db.file = secretFile "keycloak-db"; @@ -429,8 +429,7 @@ in }; # Run autosubmit bot for Gerrit - # b/333: disabled for now because of bugs - gerrit-queue.enable = false; + gerrit-autosubmit.enable = true; }; services.postgresql = { diff --git a/ops/modules/gerrit-autosubmit.nix b/ops/modules/gerrit-autosubmit.nix new file mode 100644 index 0000000000..03b293ce2e --- /dev/null +++ b/ops/modules/gerrit-autosubmit.nix @@ -0,0 +1,42 @@ +# Configuration for the Gerrit autosubmit bot (//ops/gerrit-autosubmit) +{ depot, pkgs, config, lib, ... }: + +let + cfg = config.services.depot.gerrit-autosubmit; + description = "gerrit-autosubmit - autosubmit bot for Gerrit"; + mkStringOption = default: lib.mkOption { + inherit default; + type = lib.types.str; + }; +in +{ + options.services.depot.gerrit-autosubmit = { + enable = lib.mkEnableOption description; + gerritUrl = mkStringOption "https://cl.tvl.fyi"; + + secretsFile = with lib; mkOption { + description = "Path to a systemd EnvironmentFile containing secrets"; + default = config.age.secretsDir + "/gerrit-autosubmit"; + type = types.str; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.gerrit-autosubmit = { + inherit description; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + + serviceConfig = { + ExecStart = "${depot.ops.gerrit-autosubmit}/bin/gerrit-autosubmit"; + DynamicUser = true; + Restart = "always"; + EnvironmentFile = cfg.secretsFile; + }; + + environment = { + GERRIT_URL = cfg.gerritUrl; + }; + }; + }; +} diff --git a/ops/modules/gerrit-queue.nix b/ops/modules/gerrit-queue.nix deleted file mode 100644 index 6df6e75ecc..0000000000 --- a/ops/modules/gerrit-queue.nix +++ /dev/null @@ -1,52 +0,0 @@ -# Configuration for the Gerrit autosubmit bot (//third_party/gerrit-queue) -{ depot, pkgs, config, lib, ... }: - -let - cfg = config.services.depot.gerrit-queue; - description = "gerrit-queue - autosubmit bot for Gerrit"; - mkStringOption = default: lib.mkOption { - inherit default; - type = lib.types.str; - }; -in -{ - options.services.depot.gerrit-queue = { - enable = lib.mkEnableOption description; - gerritUrl = mkStringOption "https://cl.tvl.fyi"; - gerritProject = mkStringOption "depot"; - gerritBranch = mkStringOption "canon"; - - interval = with lib; mkOption { - type = types.int; - default = 60; - description = "Interval (in seconds) for submit queue checks"; - }; - - secretsFile = with lib; mkOption { - description = "Path to a systemd EnvironmentFile containing secrets"; - default = config.age.secretsDir + "/gerrit-queue"; - type = types.str; - }; - }; - - config = lib.mkIf cfg.enable { - systemd.services.gerrit-queue = { - inherit description; - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - ExecStart = "${pkgs.gerrit-queue}/bin/gerrit-queue"; - DynamicUser = true; - Restart = "always"; - EnvironmentFile = cfg.secretsFile; - }; - - environment = { - GERRIT_URL = cfg.gerritUrl; - GERRIT_PROJECT = cfg.gerritProject; - GERRIT_BRANCH = cfg.gerritBranch; - SUBMIT_QUEUE_TRIGGER_INTERVAL = toString cfg.interval; - }; - }; - }; -} diff --git a/ops/secrets/gerrit-autosubmit.age b/ops/secrets/gerrit-autosubmit.age new file mode 100644 index 0000000000..2e04be952d Binary files /dev/null and b/ops/secrets/gerrit-autosubmit.age differ diff --git a/ops/secrets/gerrit-queue.age b/ops/secrets/gerrit-queue.age deleted file mode 100644 index 2e04be952d..0000000000 Binary files a/ops/secrets/gerrit-queue.age and /dev/null differ diff --git a/ops/secrets/secrets.nix b/ops/secrets/secrets.nix index a269b06b4e..cdaceedb35 100644 --- a/ops/secrets/secrets.nix +++ b/ops/secrets/secrets.nix @@ -36,7 +36,7 @@ in "clbot.age" = whitbyDefault; "depot-inbox-imap.age" = sandunyDefault; "depot-replica-key.age" = whitbyDefault; - "gerrit-queue.age" = whitbyDefault; + "gerrit-autosubmit.age" = whitbyDefault; "gerrit-secrets.age" = whitbyDefault; "grafana.age" = whitbyDefault; "irccat.age" = whitbyDefault; -- cgit 1.4.1