talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixosTests.flannel: handleTest -> runTest

Browse Source
This commit is contained in:
Sizhe Zhao 2025-06-07 21:43:30 +08:00
parent bb76321386
commit 40a27ed8e7
No known key found for this signature in database
GPG Key ID: ED1807251A7DA08F
2 changed files with 47 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View File

@ -530,7 +530,7 @@ in
};
fish = runTest ./fish.nix;
firezone = runTest ./firezone/firezone.nix;
flannel = handleTestOn [ "x86_64-linux" ] ./flannel.nix { };
flannel = runTestOn [ "x86_64-linux" ] ./flannel.nix;
flaresolverr = runTest ./flaresolverr.nix;
flood = runTest ./flood.nix;
floorp = runTest {

16
nixos/tests/flannel.nix
View File

@ -1,17 +1,12 @@
import ./make-test-python.nix (
{ lib, ... }:
{
name = "flannel";
meta = with lib.maintainers; {
maintainers = [ offline ];
};
meta.maintainers = with lib.maintainers; [ offline ];
nodes =
let
flannelConfig =
{ pkgs, ... }:
{
flannelConfig = {
services.flannel = {
enable = true;
backend = {
@ -27,11 +22,8 @@ import ./make-test-python.nix (
};
in
{
etcd =
{ ... }:
{
services = {
etcd = {
services.etcd = {
enable = true;
listenClientUrls = [ "http://0.0.0.0:2379" ]; # requires ip-address for binding
listenPeerUrls = [ "http://0.0.0.0:2380" ]; # requires ip-address for binding
@ -39,7 +31,6 @@ import ./make-test-python.nix (
initialAdvertisePeerUrls = [ "http://etcd:2379" ];
initialCluster = [ "etcd=http://etcd:2379" ];
};
};
networking.firewall.allowedTCPPorts = [ 2379 ];
};
@ -63,4 +54,3 @@ import ./make-test-python.nix (
node2.wait_until_succeeds(f"ping -c 1 {ip1}")
'';
}
)