Unverified Commit 700de524 authored by maxine's avatar maxine Committed by GitHub
Browse files

Merge pull request #198390 from euank/k3s-tests-fixup 

nixos/tests/k3s: fix multi-node test
parents f5a573fc 9d477c37

nixos/tests/k3s/multi-node.nix

+6 −3
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: 
          enable = true;

          role = "agent";

          serverAddr = "https://192.168.1.3:6443";

          extraFlags = lib.toString [

          extraFlags = lib.concatStringsSep " " [

            "--pause-image" "test.local/pause:local"

            "--node-ip" "192.168.1.2"

          ];
@@ -138,12 +138,15 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: 
          m.start()

          m.wait_for_unit("k3s")



      is_aarch64 = "${toString pkgs.stdenv.isAarch64}" == "1"



      # wait for the agent to show up

      server.wait_until_succeeds("k3s kubectl get node agent")



      for m in machines:

      '' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)"

      + lib.optionalString (!pkgs.stdenv.isAarch64) ''m.succeed("k3s check-config")'' + ''

          # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)"

          if not is_aarch64:

              m.succeed("k3s check-config")

          m.succeed(

              "${pauseImage} | k3s ctr image import -"

          )