diff options
| author | Charles Strahan <charles@cstrahan.com> | 2018-03-17 01:35:35 -0400 |
|---|---|---|
| committer | Charles Strahan <charles@cstrahan.com> | 2018-03-30 17:33:45 -0400 |
| commit | 709b6f664e472ae2075bbee83bfb1dd1ba95e0e7 (patch) | |
| tree | 9734a502a41317637cb25a8986c47c1e8d7a7224 /nixos/release.nix | |
| parent | 5de6ee22d1286b8b87b8dae56a1310f4b43af81e (diff) | |
| download | nixpkgs-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.tar nixpkgs-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.tar.gz nixpkgs-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.tar.bz2 nixpkgs-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.tar.lz nixpkgs-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.tar.xz nixpkgs-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.tar.zst nixpkgs-709b6f664e472ae2075bbee83bfb1dd1ba95e0e7.zip | |
nixos: kubernetes fixes
* Fix reference CNI plugins
* The plugins were split out of the upstream cni repo around version
0.6.0
* Fix RBAC and DNS tests
* Fix broken apiVersion fields
* Change plugin linking to look in ${package}/bin rather than
${package.plugins}
* Initial work towards a working e2e test
* Test still fails, but at least the expression evaluates now
Continues @srhb's work in #37199
Fixes #37199
Diffstat (limited to 'nixos/release.nix')
| -rw-r--r-- | nixos/release.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index 9b4aa4b0399..c04f55bef8e 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -296,7 +296,10 @@ in rec { tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {}; tests.kernel-latest = callTest tests/kernel-latest.nix {}; tests.kernel-lts = callTest tests/kernel-lts.nix {}; - tests.kubernetes = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/kubernetes/default.nix {}; + tests.kubernetes.dns = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/kubernetes/dns.nix {}; + ## kubernetes.e2e should eventually replace kubernetes.rbac when it works + #tests.kubernetes.e2e = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/kubernetes/e2e.nix {}; + tests.kubernetes.rbac = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/kubernetes/rbac.nix {}; tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; }; tests.ldap = callTest tests/ldap.nix {}; #tests.lightdm = callTest tests/lightdm.nix {}; |