02/02: hydra: bayfront: Update some bordeaux related configuration.

[Christopher Baines]

cbaines pushed a commit to branch master
in repository maintenance.

commit 71f8bf2229ffa4b709558663f49e758208e512ef
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Fri Jun 10 13:34:44 2022 +0100

    hydra: bayfront: Update some bordeaux related configuration.
    
    * hydra/bayfront.scm (%guix-build-coordinator-configuration): Switch
    to using the data.qa.guix.gnu.org domain. Tag nars with
    "unknown-if-for-master" to help identify nars that don't relate to the
    master branch.
    <services>: Replace lakeside.guix.gnu.org with bishan.guix.gnu.org,
    and check that nars are stored on hatysa in addition to bishan before
    removing them from bayfront.
---
 hydra/bayfront.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/hydra/bayfront.scm b/hydra/bayfront.scm
index aa2e9a4..07e29e6 100644
--- a/hydra/bayfront.scm
+++ b/hydra/bayfront.scm
@@ -681,13 +681,13 @@ access_log  /var/log/nginx/bordeaux.access.log;"))
               (call-with-input-file
                   "/etc/guix-build-coordinator/data.guix.gnu.org-token"
                 get-string-all))))
-         (data.guix-patches.cbaines.net-build-event-destination
+         (data.qa.guix.gnu.org-build-event-destination
           #~(string-append
-             "https://data.guix-patches.cbaines.net";
+             "https://data.qa.guix.gnu.org";
              "/build-server/2/build-events?token="
              (string-trim-right
               (call-with-input-file
-                  
"/etc/guix-build-coordinator/data.guix-patches.cbaines.net-token"
+                  "/etc/guix-build-coordinator/data.qa.guix.gnu.org-token"
                 get-string-all))))
          (publish-directory
           "/var/lib/nars")
@@ -707,7 +707,7 @@ access_log  /var/log/nginx/bordeaux.access.log;"))
                  args)
           (apply ((@ (guix-build-coordinator hooks)
                      #$event-hook)
-                  #$data.guix-patches.cbaines.net-build-event-destination)
+                  #$data.qa.guix.gnu.org-build-event-destination)
                  args)))
 
     (guix-build-coordinator-configuration
@@ -761,6 +761,7 @@ access_log  /var/log/nginx/bordeaux.access.log;"))
                                  (command
                                   (list #$(file-append nar-herder 
"/bin/nar-herder")
                                         "import"
+                                        "--tag=unknown-if-for-master"
                                         
"--database=/var/lib/nar-herder/nar_herder.db"
                                         narinfo)))
                             (let ((exit-code
@@ -1020,7 +1021,7 @@ access_log  /var/log/nginx/bordeaux.access.log;"))
                       (servers '("localhost:8734")))
                      (nginx-upstream-configuration
                       (name "nar-storage")
-                      (servers '("lakeside.guix.gnu.org:443")))))
+                      (servers '("bishan.guix.gnu.org:443")))))
               (server-blocks
                (append %hpc.guix.info-nginx-servers
                        %guix-hpc.bordeaux.inria.fr-nginx-servers
@@ -1040,7 +1041,8 @@ access_log  /var/log/nginx/bordeaux.access.log;"))
               (storage "/var/lib/nars")
               (storage-limit 0)
               (storage-nar-removal-criteria
-               '((stored-on . "https://lakeside.guix.gnu.org";)))
+               '((and (stored-on . "https://bishan.guix.gnu.org";)
+                      (stored-on . "https://hatysa.cbaines.net";))))
               (ttl "180d")
               (log-level 'INFO)))