about summary refs log tree commit diff
path: root/nixos/tests/kubernetes
diff options
context:
space:
mode:
authorAlexandru Scvortov <code@scvalex.net>2021-07-30 16:16:23 +0100
committerAlexandru Scvortov <code@scvalex.net>2021-08-16 14:59:58 +0100
commit8afd31c625f7278237ed4622b4e3f8d449a55894 (patch)
treeae48b58b055751896ea3269e5cc622daec77f649 /nixos/tests/kubernetes
parent13aa00156246eec1043c795a9cd3f09dac6928fa (diff)
kubernetes: fix flaky test and run tests as group
Diffstat (limited to 'nixos/tests/kubernetes')
-rw-r--r--nixos/tests/kubernetes/default.nix18
1 files changed, 13 insertions, 5 deletions
diff --git a/nixos/tests/kubernetes/default.nix b/nixos/tests/kubernetes/default.nix
index a801759bf582b..90b73c68a76de 100644
--- a/nixos/tests/kubernetes/default.nix
+++ b/nixos/tests/kubernetes/default.nix
@@ -1,7 +1,15 @@
-{ system ? builtins.currentSystem }:
+{ system ? builtins.currentSystem
+, pkgs ? import <nixpkgs> { inherit system; }
+}:
+let
+  dns = import ./dns.nix { inherit system pkgs; };
+  rbac = import ./rbac.nix { inherit system pkgs; };
+  # TODO kubernetes.e2e should eventually replace kubernetes.rbac when it works
+  # e2e = import ./e2e.nix { inherit system pkgs; };
+in
 {
-  dns = import ./dns.nix { inherit system; };
-  # e2e = import ./e2e.nix { inherit system; };  # TODO: make it pass
-  # the following test(s) can be removed when e2e is working:
-  rbac = import ./rbac.nix { inherit system; };
+  dns-single-node = dns.singlenode.test;
+  dns-multi-node = dns.multinode.test;
+  rbac-single-node = rbac.singlenode.test;
+  rbac-multi-node = rbac.multinode.test;
 }