Commit 39a8e1d1 authored by Valentin Reis's avatar Valentin Reis

ci runner deployment fix

parent 5b328580
Pipeline #7580 passed with stages
in 3 minutes and 35 seconds
No preview for this file type
...@@ -67,8 +67,8 @@ let ...@@ -67,8 +67,8 @@ let
options = ''--max-freed "$((32 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | ${pkgs.gawk}/bin/awk '{ print $4 }')))"''; options = ''--max-freed "$((32 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | ${pkgs.gawk}/bin/awk '{ print $4 }')))"'';
}; };
services.openssh.enable = true; services.openssh.enable = true;
users.extraUsers.root.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)]; users.extraUsers.root.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)] ++ keys;
users.extraUsers.fre.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)]; users.extraUsers.fre.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)] ++ keys ;
}; };
mkBigChameleonRunner = ip: name: a@{...}: mkBigChameleonRunner = ip: name: a@{...}:
((mkChameleonRunner ip name a)// ((mkChameleonRunner ip name a)//
...@@ -184,7 +184,7 @@ in ...@@ -184,7 +184,7 @@ in
options = ''--max-freed "$((32 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | ${pkgs.gawk}/bin/awk '{ print $4 }')))"''; options = ''--max-freed "$((32 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | ${pkgs.gawk}/bin/awk '{ print $4 }')))"'';
}; };
services.openssh.enable = true; services.openssh.enable = true;
users.extraUsers.root.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)]; users.extraUsers.root.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)] ++ keys;
users.extraUsers.fre.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)]; users.extraUsers.fre.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)] ++ keys;
}; };
} }
#!/usr/bin/env bash
nixops deploy -s argo.nixops --include gitlab-runner-0 gitlab-runner-1 gitlab-runner-2 gitlab-runner-3 gitlab-runner-4
...@@ -48,6 +48,7 @@ let ...@@ -48,6 +48,7 @@ let
(old:{buildInputs=old.buildInputs ++ [ bi ];}); (old:{buildInputs=old.buildInputs ++ [ bi ];});
argopkgs = rec { argopkgs = rec {
singularity = bleeding.singularity;
# library of nix expressions # library of nix expressions
argolib = import ../lib/utils.nix; argolib = import ../lib/utils.nix;
...@@ -68,6 +69,13 @@ let ...@@ -68,6 +69,13 @@ let
cp -r examples $out/share cp -r examples $out/share
''; '';
}); });
nrm-virtualenv = nrm.overrideAttrs (o:{
buildInputs=o.buildInputs ++ [ pkgs.blas pkgs.liblapack pkgs.binutils-unwrapped];
buildPhase=''
virtualenv .
bin/pip install -r requirements.txt
'';
});
containers = callPackage ./containers {src=containers-src;}; containers = callPackage ./containers {src=containers-src;};
libnrm = callPackage ./libnrm {src=libnrm-src;}; libnrm = callPackage ./libnrm {src=libnrm-src;};
libnrm-pinned = callPackage ./libnrm {src=fetched libnrm/pin.json;}; libnrm-pinned = callPackage ./libnrm {src=fetched libnrm/pin.json;};
...@@ -209,7 +217,7 @@ let ...@@ -209,7 +217,7 @@ let
# re-export from hpkgs and add non-haskell build rule specialization # re-export from hpkgs and add non-haskell build rule specialization
inherit (haskellPackages) repoquality; inherit (haskellPackages) repoquality;
inherit (bleedingHaskellPackages) dhall dhall-json; inherit (bleedingHaskellPackages) dhall dhall-lsp-server dhall-json;
nrm-schema = haskellPackages.nrm-schema.overrideAttrs (old:{ nrm-schema = haskellPackages.nrm-schema.overrideAttrs (old:{
buildInputs = old.buildInputs ++ [ buildInputs = old.buildInputs ++ [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment