01/01: hydra: machines: Update for the Guile-SSH-based 'offload' hook.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository maintenance.

commit 89ad7404a784d47b49c860b6292f74d4444ca7c8
Author: Ludovic Courtès <address@hidden>
Date:   Tue Dec 6 00:35:11 2016 +0100

    hydra: machines: Update for the Guile-SSH-based 'offload' hook.
---
 hydra/machines.scm |   38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/hydra/machines.scm b/hydra/machines.scm
index 4ad8199..7381c2c 100644
--- a/hydra/machines.scm
+++ b/hydra/machines.scm
@@ -1,13 +1,17 @@
 ;;; The /etc/guix/machines.scm file for hydra.gnu.org.  It defines the build
 ;;; machines that hydra.gnu.org can offload to.
 
+(define %openssh-private-key
+  "/home/hydra/.ssh/id_rsa")
+
 (define gnunet
   (build-machine
    (name "hydra.gnunet.org") ;; "131.159.14.26"
    (user "hydra")
    (system "x86_64-linux")
-   (private-key "/home/hydra/.lsh/identity")
-   (ssh-options '("-c" "aes256-ctr"))
+   (private-key %openssh-private-key)
+   ;;(host-key "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIDOl8ADHhHcYnRpK5SIZaMHu5NZmpU43I86j5mde+UhL 
address@hidden")
+   (host-key "ssh-rsa 
AAAAB3NzaC1yc2EAAAADAQABAAABAQC3OPXO9pSx/+m+o4AQoyJphtFKhoQqWjwu9NaVZwmRc1B7QWqoX1OHTzhl1ybSj62sgqp1gPxkrwBCyahZIIhEE0B6pb0ixHj1iuHgdu65gFNLT3zn+43zWS+9YDMXu9C7QmTvhHhqQ3I1/6lDWL81Fr2tqWtqUzLCMGbTKfXr4QbJUk0xmfx1/zhPP4nkeoz+kF+UpQptBCOpbTRqWrSQ7eyZlj74MfiufW7IRkCJ5MJoTiJJOYfVhhZ8kxU+tYcfng0DoPlAOg9qXN6wBbQl/wlqzl878maPSYrXNlJJqezyieK1Zg8/ARq9JuK7ACqjQbGLafLKxFylCG8yObPf
 address@hidden")
    (speed 1.7)
    (parallel-builds 4)))
 
@@ -21,8 +25,8 @@
    (name "guix.sjd.se")
    (user "hydra")
    (system "x86_64-linux")
-   (private-key "/home/hydra/.lsh/identity")
-   (ssh-options '("-c" "aes256-ctr"))
+   (private-key %openssh-private-key)
+   (host-key "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIDqac0wX1BQ8BTZbUk7ZgUUROBBLBf0Rs/YqQ0f3dWLj 
address@hidden")
    (speed 1.6)
    (parallel-builds 3)))  ;8 cores
 
@@ -37,7 +41,8 @@
     (port 9022)
     (user "hydra")
     (system "x86_64-linux")
-    (private-key "/home/hydra/.lsh/identity")
+    (private-key %openssh-private-key)
+    (host-key "ssh-rsa 
AAAAB3NzaC1yc2EAAAADAQABAAABAQDMfqN4Yt7GbAPmI5rPjY7nmChhWUMYZHlopWIcFJVNlTkKUtUYTfb8esQ4zit6qNJot1zvqAvInZWars1OtOqpeedn7kIs2hT/YPqC4dDktaHtViJlAwNp5l8HiVA5pvc1cWDx8r6BlvYeWyCBLWgvKJcCrHXXoYQB3Rrwov2d0McRfnX2YqEjfwbN8kB4bw7he38UFUlq7/n0eSFw7dturFAInGVSSEO/ro6PWacHNnc84pISvz5y1BCAkCO7B798ZlhuWEzP4TZsmXDp24vK4TWtdTsYNTURVdFzBgz66Sxcu0v4B34Y0Cy8Xo7DhUtN1Me45PcDBrw3jawywxTx")
     (speed 1.4)
     (parallel-builds 2)))
 
@@ -51,18 +56,19 @@
     (port 9023)
     (user "hydra")
     (system "armhf-linux")
-    (private-key "/home/hydra/.lsh/identity")
-    (ssh-options '("-c" "aes256-ctr"))
+    (private-key %openssh-private-key)
+    (host-key "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIFeUsbVEfJBZY2DCKkINByFtL72EefJ7QUmd0OAPVuJe 
address@hidden")
     (speed 1.0)
     (parallel-builds 4)))
 
-(define librenote-mips64el
+(define librenote-mips64el                        ;unreachable: dead fan
   (build-machine
+    (host-key "FIXME")
     (name "librenote.netris.org")
     (port 7272)
     (user "hydra")
     (system "mips64el-linux")
-    (private-key "/home/hydra/.lsh/identity")
+    (private-key %openssh-private-key)
     (speed 0.6)
     (parallel-builds 2)))
 
@@ -72,7 +78,8 @@
     (port 7272)
     (user "hydra")
     (system "mips64el-linux")
-    (private-key "/home/hydra/.lsh/identity")
+    (private-key %openssh-private-key)
+    (host-key "ssh-rsa 
AAAAB3NzaC1yc2EAAAADAQABAAABAQC9+zyCbJwLr9V/cb3YSQ5SzI3TUvU2QBG6QTuwpJt4lLKsg3jZhIWbY0ZjBd7qEsF7TkWhS5dymt00jwfBmb2JZSdoFaf9MVPLybCKtSvhhpi1Bw9i5ylOLjDP9opG0r26+bZ1e9vNgPj+xi7ZFrPT5B0UBCAYLUOGLoNlG82FS43xeGrRvyJ5VToU+ckyBp1Uei+deE6KMX5lH9p4CKjqop9g9O86W8tGHISo0xu5NI5nzvTpkjYKN6OaQuSuRaP+fpx6pFsJvoVXtHwqF5gDOTfHdmeAgq+WxgUkJcvO/G/YkD9QI58tozrT4Ok2RKKum9VIdNwVGthMnS2fdw0l
 address@hidden")
     (speed 0.6)
     (parallel-builds 2)))
 
@@ -82,8 +89,8 @@
     (port 7275)
     (user "hydra")
     (system "armhf-linux")
-    (private-key "/home/hydra/.lsh/identity")
-    (ssh-options '("-c" "aes256-ctr"))
+    (private-key %openssh-private-key)
+    (host-key "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIPDAe9mXufZXFfFlezafA/G2Nng66ssLLi5xPP+9NhGm 
address@hidden")
     (speed 1.0)
     (parallel-builds 2)))
 
@@ -93,8 +100,8 @@
     (port 7276)
     (user "hydra")
     (system "armhf-linux")
-    (private-key "/home/hydra/.lsh/identity")
-    (ssh-options '("-c" "aes256-ctr"))
+    (private-key %openssh-private-key)
+    (host-key "ssh-ed25519 
AAAAC3NzaC1lZDI1NTE5AAAAIHzlJZzZfPiEcehmLFtQVYVt3j9w4DHPL6YgSC3EHJK+ 
address@hidden")
     (speed 1.0)
     (parallel-builds 2)))
 
@@ -103,7 +110,8 @@
 
       sjd sjd-i686
 
-      chapters chapters-i686
+      ;; FIXME: Temporarily disabled until Guile 2.0.13 is installed there.
+      ;;chapters chapters-i686
 
       redhill