branch master updated: hydra: berlin: Use local substitutes.

[Ludovic Courtès]

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

civodul pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 843b517  hydra: berlin: Use local substitutes.
843b517 is described below

commit 843b517153104e81667857448cb382974ce6ef47
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Tue May 30 17:36:37 2023 +0200

    hydra: berlin: Use local substitutes.
    
    * hydra/modules/sysadmin/services.scm (guix-daemon-config)
    (frontend-services): Add #:substitute-urls and honor it.
    * hydra/berlin.scm: Pass #:substitute-urls to 'frontend-services'.
---
 hydra/berlin.scm                    | 10 ++++++++--
 hydra/modules/sysadmin/services.scm |  7 +++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index 4ba2a11..1359644 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -1,6 +1,6 @@
 ;; OS configuration for "berlin", the frontend of the compile farm
 ;; hosted at the MDC.
-;; Copyright © 2016-2022 Ludovic Courtès <ludo@gnu.org>
+;; Copyright © 2016-2023 Ludovic Courtès <ludo@gnu.org>
 ;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus 
<rekado@elephly.net>
 ;; Copyright © 2019, 2021 Julien Lepiller <julien@lepiller.eu>
 ;; Copyright © 2020, 2021 Florian Pelz <pelzflorian@pelzflorian.de>
@@ -641,9 +641,15 @@ An incremental send is attempted if a PARENT snapshot is 
provided."
               (website-services)
               (modify-services
                   (frontend-services %sysadmins
-                                     ;; Make sure we get enough build users.
                                      #:authorized-keys %build-node-keys
+
+                                     ;; Get substitutes from our local 'guix
+                                     ;; publish' cache.
+                                     #:substitute-urls 
'("http://ci.guix.gnu.org";)
+
+                                     ;; Make sure we get enough build users.
                                      #:build-accounts-to-max-jobs-ratio 5
+
                                      #:gc-threshold #f
                                      #:systems '("x86_64-linux" "i686-linux"
                                                  "aarch64-linux"
diff --git a/hydra/modules/sysadmin/services.scm 
b/hydra/modules/sysadmin/services.scm
index d5899da..b2024ca 100644
--- a/hydra/modules/sysadmin/services.scm
+++ b/hydra/modules/sysadmin/services.scm
@@ -234,9 +234,10 @@ collection instead."
 
 (define* (guix-daemon-config #:key (max-jobs 5) (cores 4)
                              (build-accounts-to-max-jobs-ratio 4)
-                             (authorized-keys '()))
+                             (authorized-keys '())
+                             (substitute-urls '()))
   (guix-configuration
-   (substitute-urls '())
+   (substitute-urls substitute-urls)
    (authorized-keys authorized-keys)
 
    ;; We don't want to let builds get stuck for too long, but we still want
@@ -634,6 +635,7 @@ to a selected directory.")
                             nginx-config-file
                             (max-jobs 5)
                             (cores 4)
+                            (substitute-urls '())
                             (build-accounts-to-max-jobs-ratio 4)
                             (branches '("master" "staging" "core-updates"
                                         "kernel-updates"))
@@ -688,6 +690,7 @@ to a selected directory.")
                  (modify-services %base-services
                    (guix-service-type
                     config => (guix-daemon-config
+                               #:substitute-urls substitute-urls
                                #:max-jobs max-jobs
                                #:cores cores
                                #:authorized-keys authorized-keys