From 52b4cba9002a46128d47b2fa5565678fdff1a4ba Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Thu, 23 Nov 2023 12:39:43 +0100
Subject: [PATCH] Enable runners for pm.bsc.es/gitlab too

The old runners for the PM gitlab were disabled in configuration in the
last outage, but they remained working until we reboot the node. With
this change we enable the runners for both PM and gitlab.bsc.es.

Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>
---
 m/hut/gitlab-runner.nix | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/m/hut/gitlab-runner.nix b/m/hut/gitlab-runner.nix
index fd12123b..3cbe4f66 100644
--- a/m/hut/gitlab-runner.nix
+++ b/m/hut/gitlab-runner.nix
@@ -8,9 +8,8 @@
   services.gitlab-runner = {
     enable = true;
     settings.concurrent = 5;
-    services = {
-      gitlab-bsc-es-shell = {
-        registrationConfigFile = config.age.secrets.gitlabToken.path;
+    services = let
+      common-shell = {
         executor = "shell";
         tagList = [ "nix" "xeon" ];
         registrationFlags = [
@@ -21,8 +20,7 @@
           SHELL = "${pkgs.bash}/bin/bash";
         };
       };
-      gitlab-bsc-es-docker = {
-        registrationConfigFile = config.age.secrets.gitlabToken.path;
+      common-docker = {
         dockerImage = "debian:stable";
         tagList = [ "docker" "xeon" ];
         registrationFlags = [
@@ -34,6 +32,21 @@
           http_proxy = "http://localhost:23080";
         };
       };
+    in {
+      # For gitlab.bsc.es
+      gitlab-bsc-es-shell = common-shell // {
+        registrationConfigFile = config.age.secrets.gitlabToken.path;
+      };
+      gitlab-bsc-es-docker = common-docker // {
+        registrationConfigFile = config.age.secrets.gitlabToken.path;
+      };
+      # For pm.bsc.es/gitlab
+      gitlab-pm-shell = common-shell // {
+        registrationConfigFile = config.age.secrets.ovniToken.path;
+      };
+      gitlab-pm-docker = common-docker // {
+        registrationConfigFile = config.age.secrets.ovniToken.path;
+      };
     };
   };