Commit c6aee253 authored by Valentin Reis's avatar Valentin Reis
Browse files

update for singularity tests

parent 71a4ddf5
Pipeline #7417 canceled with stages
in 9 minutes and 14 seconds
No preview for this file type
...@@ -6,8 +6,7 @@ let ...@@ -6,8 +6,7 @@ let
argopkgs = import ../pkgs {}; argopkgs = import ../pkgs {};
hydraSrc = builtins.fetchTarball https://github.com/nixos/hydra/archive/master.tar.gz; hydraSrc = builtins.fetchTarball https://github.com/nixos/hydra/archive/master.tar.gz;
argomodules = import ../modules/module-list.nix; argomodules = import ../modules/module-list.nix;
mkChameleonRunner = ip: name: mkChameleonRunner = ip: name: { ... }:
{ ... }:
{ {
deployment.targetEnv = "none"; deployment.targetEnv = "none";
deployment.targetHost = ip; deployment.targetHost = ip;
...@@ -71,6 +70,31 @@ let ...@@ -71,6 +70,31 @@ let
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)];
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)];
}; };
mkBigChameleonRunner = ip: name: a@{...}:
((mkChameleonRunner ip name a)//
{
virtualisation.docker = {
enable = true;
};
#networking.firewall.enable = false;
#systemd.services."rkt-afl" = {
#description = "Airflow";
#wantedBy = [ "multi-user.target" ];
#serviceConfig = {
#Slice = "machine.slice";
#ExecStart = ''\
#${pkgs.rkt}/bin/rkt run --insecure-options=image \
#--port=8080-tcp:8080 \
#--volume=volume-root-airflow,kind=host,source=/var/airflow,readOnly=false \
#docker://puckel/docker-airflow \
#webserver
#'';
#KillMode = "mixed";
#Restart = "always";
#};
#};
});
in in
{ {
network.description = "argo-ci"; network.description = "argo-ci";
...@@ -80,7 +104,7 @@ in ...@@ -80,7 +104,7 @@ in
gitlab-runner-3 = mkChameleonRunner "129.114.110.3" "chameleon-129.114.110.3"; gitlab-runner-3 = mkChameleonRunner "129.114.110.3" "chameleon-129.114.110.3";
gitlab-runner-2 = mkChameleonRunner "129.114.111.116" "chameleon-129.114.111.116"; gitlab-runner-2 = mkChameleonRunner "129.114.111.116" "chameleon-129.114.111.116";
gitlab-runner-1 = mkChameleonRunner "129.114.33.201" "chameleon-129.114.33.201"; gitlab-runner-1 = mkChameleonRunner "129.114.33.201" "chameleon-129.114.33.201";
gitlab-runner-0 = mkChameleonRunner "129.114.111.64" "chameleon-129.114.111.64"; gitlab-runner-0 = mkBigChameleonRunner "129.114.111.64" "chameleon-129.114.111.64";
gitlab-runner-physical = gitlab-runner-physical =
{ ... }: { ... }:
...@@ -88,6 +112,11 @@ in ...@@ -88,6 +112,11 @@ in
deployment.targetEnv = "none"; deployment.targetEnv = "none";
deployment.targetHost = "140.221.10.9"; deployment.targetHost = "140.221.10.9";
environment.argo.singularity ={
enable = true;
package = argopkgs.singularity;
};
imports = [ ./gitlab-runner.nix]; imports = [ ./gitlab-runner.nix];
time.timeZone = "America/Chicago"; time.timeZone = "America/Chicago";
......
...@@ -72,6 +72,23 @@ ...@@ -72,6 +72,23 @@
[ "toto" ] : Optional Text [ "toto" ] : Optional Text
} }
) )
, exitcode =
lib.makeBase
( lib.emptyMakeBaseArg "false" basicManifest cn
⫽ { args =
[] : List Text
, verbose =
True
, cmdwants =
[] : List Text
, cmdavoids =
[ "Traceback" ]
, timeout =
[ 600 ] : Optional Natural
, runExitcode =
[ +1 ] : Optional Integer
}
)
, hello = , hello =
lib.makeBase lib.makeBase
( lib.emptyMakeBaseArg "echo" basicManifest cn ( lib.emptyMakeBaseArg "echo" basicManifest cn
......
...@@ -51,6 +51,10 @@ ...@@ -51,6 +51,10 @@
[ "PATH" ] [ "PATH" ]
, timeout = , timeout =
[] : Optional Natural [] : Optional Natural
, otherwd =
[] : Optional Text
, exitcode =
[] : Optional Integer
} }
let Powercap = < Cap : Text | NoCap : {} > let Powercap = < Cap : Text | NoCap : {} >
...@@ -76,6 +80,8 @@ ...@@ -76,6 +80,8 @@
List types.EnvVar List types.EnvVar
, timeout : , timeout :
Optional Natural Optional Natural
, runExitcode :
Optional Integer
, passvars : , passvars :
List Text List Text
, powercap : , powercap :
...@@ -108,6 +114,8 @@ ...@@ -108,6 +114,8 @@
values.emptyVars values.emptyVars
, timeout = , timeout =
[] : Optional Natural [] : Optional Natural
, runExitcode =
[] : Optional Integer
, passvars = , passvars =
[] : List Text [] : List Text
, powercap = , powercap =
...@@ -158,8 +166,6 @@ ...@@ -158,8 +166,6 @@
"/tmp/argo_nodeos_config" "/tmp/argo_nodeos_config"
} }
] ]
, otherwd =
[] : Optional Text
} }
, let b = , let b =
basicCommand basicCommand
...@@ -188,6 +194,8 @@ ...@@ -188,6 +194,8 @@
args.vars args.vars
, timeout = , timeout =
args.timeout args.timeout
, exitcode =
args.runExitcode
, otherwd = , otherwd =
args.runwd args.runwd
} }
...@@ -296,6 +304,8 @@ ...@@ -296,6 +304,8 @@
args.timeout args.timeout
, runwd = , runwd =
[] : Optional Text [] : Optional Text
, runExitcode =
[] : Optional Integer
, powercap = , powercap =
args.powercap args.powercap
} }
......
...@@ -54,3 +54,4 @@ testSingularity: ...@@ -54,3 +54,4 @@ testSingularity:
extends: .test extends: .test
script: script:
- "argonix build testSingularity --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix build testSingularity --argopkgs $ARGOPKGS $EXTRA --verbose"
- notknl
{ {
"url": "https://github.com/freuk/dhrun.git", "url": "https://github.com/freuk/dhrun.git",
"rev": "050991b7f2f1a885507d7cffadf61b06e0f61277", "rev": "d0ad28692d7071a1408d196d29b0c8e4303f8ca8",
"date": "2019-05-20T13:47:58-05:00", "date": "2019-05-21T10:33:48-05:00",
"sha256": "1ac1zz4isx9imjm5hr3flh7fgn8mdqibflb77kzyybz5fr9ifnh9", "sha256": "19dmxgh5lkwslg3hwr84nrbskhpn6qfmn6iidxnv6i8jkmv18zpk",
"fetchSubmodules": false "fetchSubmodules": false
} }
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