[ci] fixes for Hydra

deployments/ci.nix

@@ -43,19 +43,11 @@ in
         nrBuildUsers = 30;
         distributedBuilds = true;
         buildMachines = [
-          {
-            hostName = "129.114.111.114";
-            maxJobs = 10;
-            speedFactor = 1;
-            sshKey = "/run/id_buildfarm";
-            sshUser = "root";
-            systems = ["builtin" "x86_64-linux" "i686-linux"];
-            supportedFeatures = [ "nixos-test" "benchmark" ];
-          }
           {
             hostName = "argo-phi2";
             maxJobs = 40;
             speedFactor = 1;
+            sshKey = "/run/id_buildfarm";
             sshUser = "freux";
             systems = ["builtin" "x86_64-linux" "i686-linux"];
             supportedFeatures = [ "nixos-test" "benchmark" "icc" ];
@@ -167,7 +159,7 @@ in
             /run/current-system/sw/bin/chmod 440 /etc/nix/140.221.10.9/secret
             /run/current-system/sw/bin/chmod 444 /etc/nix/140.221.10.9/public
             #store
-            /run/current-system/sw/bin/install -d -m 766 /var/lib/hydra/cache
+            /run/current-system/sw/bin/install -d -m 776 /var/lib/hydra/cache
             /run/current-system/sw/bin/chown -R hydra-queue-runner:hydra /var/lib/hydra/cache
             # done
             touch ~hydra/.setup-is-complete

deployments/send-secret.sh

 #!/usr/bin/env bash
 
 echo "extracting/sending hydra-master secret key from password store"
-pass keys/rsa/PRIVATE/hydra-master@chameleon | ssh root@129.114.111.116 'cat > /run/id_buildfarm'
-cat ./auth_argo | ssh root@129.114.111.116 'cat > /run/auth_argo'
+pass keys/rsa/PRIVATE/hydra-master@chameleon | ssh root@140.221.10.9 'cat > /run/id_buildfarm'
 echo "chown-ing the key on the machine"
-ssh root@129.114.111.116 'chown hydra-queue-runner:hydra /run/id_buildfarm'
-ssh root@129.114.111.116 'chmod 600 /run/id_buildfarm'
+ssh root@140.221.10.9 'chown hydra-queue-runner:hydra /run/id_buildfarm'
+ssh root@140.221.10.9 'chmod 600 /run/id_buildfarm'

modules/ssh-config/ssh_config

-Host argo-phi2
-HostName localhost
-Port 2210
-User freux
-IdentityFile /run/secrets/id_buildfarm

pkgs/default.nix

@@ -93,7 +93,7 @@ let
 
     argopkgs = pkgs.releaseTools.channel {
       name = "argopkgs";
-      src = ./.;
+      src = ../.;
       constituents = [ ];
     };