fix(testing): e2e testing fixes

This commit is contained in:
Jaka Hudoklin 2019-02-20 15:39:26 +01:00
parent 3549610e0e
commit b43748a3a5
No known key found for this signature in database
GPG key ID: 6A08896BFD32BD95

View file

@ -29,10 +29,11 @@ let
in nixosTesting.makeTest { in nixosTesting.makeTest {
inherit name; inherit name;
nodes = mapAttrs (machineName: machine: nodes = mapAttrs (machineName: machine: { config, pkgs, lib, nodes, ... }: {
{ config, pkgs, lib, nodes, ... }: imports = [<nixpkgs/nixos/modules/profiles/minimal.nix>];
mkMerge [
{ config = mkMerge [{
virtualisation.cores = "all";
boot.postBootCommands = "rm -fr /var/lib/kubernetes/secrets /tmp/shared/*"; boot.postBootCommands = "rm -fr /var/lib/kubernetes/secrets /tmp/shared/*";
virtualisation.memorySize = mkDefault 1536; virtualisation.memorySize = mkDefault 1536;
virtualisation.diskSize = mkDefault 4096; virtualisation.diskSize = mkDefault 4096;
@ -69,9 +70,8 @@ let
]; ];
}) })
(optionalAttrs (machine ? "extraConfiguration") (machine.extraConfiguration { inherit config pkgs lib nodes; })) (optionalAttrs (machine ? "extraConfiguration") (machine.extraConfiguration { inherit config pkgs lib nodes; }))
(optionalAttrs (extraConfiguration != null) (extraConfiguration { inherit config pkgs lib nodes; })) (optionalAttrs (extraConfiguration != null) (extraConfiguration { inherit config pkgs lib nodes; }))];
] }) machines;
) machines;
testScript = '' testScript = ''
startAll; startAll;
@ -190,7 +190,7 @@ in {
script = if evaled.config.test.check != null then mkKubernetesSingleNodeTest { script = if evaled.config.test.check != null then mkKubernetesSingleNodeTest {
name = config.name; name = config.name;
test = '' test = ''
$kube->waitUntilSucceeds("kubectl get node machine1.my.zyx | grep -w Ready"); $kube->waitUntilSucceeds("kubectl get node kube.my.zyx | grep -w Ready");
${evaled.config.test.check} ${evaled.config.test.check}
''; '';
} else null; } else null;