guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: hydra: Update configuration for the monokuma Over


From: Christopher Baines
Subject: branch master updated: hydra: Update configuration for the monokuma Overdrive machine.
Date: Sun, 20 Feb 2022 09:14:35 -0500

This is an automated email from the git hooks/post-receive script.

cbaines pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 0340e79  hydra: Update configuration for the monokuma Overdrive 
machine.
0340e79 is described below

commit 0340e7995a7929f3deea851232ded8c9dd4ae0df
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Sun Feb 20 14:12:59 2022 +0000

    hydra: Update configuration for the monokuma Overdrive machine.
    
    Long overdue, I think this rough configuration has been in place for a
    while now.
    
    * hydra/monokuma.scm (%authorized-guix-keys): Remove.
    <services>: Add the guix-build-coordinator-agent, and change the guix
    service configuration.
---
 hydra/monokuma.scm | 51 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/hydra/monokuma.scm b/hydra/monokuma.scm
index f8ebecd..8b99fc9 100644
--- a/hydra/monokuma.scm
+++ b/hydra/monokuma.scm
@@ -3,8 +3,8 @@
 ;; Released under the GNU GPLv3 or any later version.
 
 (use-modules (guix) (gnu))
-(use-service-modules networking mcron ssh monitoring)
-(use-package-modules screen ssh linux certs)
+(use-service-modules networking mcron ssh monitoring guix)
+(use-package-modules screen ssh linux certs package-management)
 
 (define (sysadmin name full-name)
   (user-account
@@ -27,10 +27,6 @@
          (group "users")
          (home-directory (string-append "/home/" name)))))
 
-(define %authorized-guix-keys
-  ;; List of authorized 'guix archive' keys.
-  (list (local-file "keys/guix/berlin.guixsd.org-export.pub")))
-
 (define gc-job
   ;; Run 'guix gc' at 3AM every day.
   #~(job '(next-hour '(3)) "guix gc -F 200G"))
@@ -77,6 +73,7 @@
                                 ("rekado" ,(local-file "keys/ssh/rekado.pub"))
                                 ("roptat" ,(local-file "keys/ssh/roptat.pub"))
                                 ("lfam" ,(local-file "keys/ssh/lfam.pub"))
+                                ("cbaines" ,(local-file 
"keys/ssh/cbaines.pub"))
                                 ("dannym" ,(local-file 
"keys/ssh/dannym.pub"))))))
                    (service dhcp-client-service-type)
                    (service mcron-service-type
@@ -93,14 +90,40 @@
                    (service ntp-service-type)
                    (service prometheus-node-exporter-service-type)
 
+                   (service guix-build-coordinator-agent-service-type
+                            (guix-build-coordinator-agent-configuration
+                             (coordinator
+                              "https://coordinator.bayfront.guix.gnu.org";)
+                             (authentication
+                              (guix-build-coordinator-agent-password-file-auth
+                               (uuid "5bbaa369-517d-49a1-9875-dc8fcf1e2e9f")
+                               (password-file
+                                "/etc/guix-build-coordinator-agent-password")))
+                             (max-parallel-builds 4)
+                             (systems '("aarch64-linux" "armhf-linux"))
+                             (derivation-substitute-urls
+                              (list "https://data.guix.gnu.org";))
+                             (non-derivation-substitute-urls
+                              (list "https://bordeaux.guix.gnu.org";))))
+
                    (modify-services %base-services
-                     (guix-service-type config =>
-                                        (guix-configuration
-                                         (inherit config)
-                                         (max-silent-time 21600)
-                                         (authorized-keys
-                                          %authorized-guix-keys)
-                                         (extra-options
-                                          '("--max-jobs=4")))))))
+                     (guix-service-type
+                      config => (guix-configuration
+                                 (inherit config)
+
+                                 (substitute-urls
+                                  '("https://bordeaux.guix.gnu.org";))
+
+                                 (max-silent-time (* 12 3600))
+                                 (timeout (* 48 3600))
+
+                                 (authorized-keys
+                                  (list
+                                   (file-append
+                                    guix 
"/share/guix/bordeaux.guix.gnu.org.pub")
+                                   ;; for substituting derivations
+                                   (local-file 
"keys/guix/data.guix.gnu.org.pub")))
+                                 (extra-options
+                                  '("--max-jobs=4")))))))
 
   (packages (cons* btrfs-progs screen openssh strace nss-certs 
%base-packages)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]