Unverified Commit 5edd6d6e authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

nixosTests.k3s.{single-node,multi-node}: enable check-config for aarch64 (#343296)

parents b66dad79 e9002b6b

nixos/tests/k3s/multi-node.nix

+1 −3
Original line number Diff line number Diff line
@@ -195,8 +195,6 @@ import ../make-test-python.nix ( 
      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)"

          if not is_aarch64:

          m.succeed("k3s check-config")

          m.succeed(

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

nixos/tests/k3s/single-node.nix

+28 −32
Original line number Diff line number Diff line
@@ -76,17 +76,13 @@ import ../make-test-python.nix ( 
        };

      };



    testScript =

      ''

    testScript = ''

      start_all()



      machine.wait_for_unit("k3s")

      machine.succeed("kubectl cluster-info")

      machine.fail("sudo -u noprivs kubectl cluster-info")

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

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

      + ''



      machine.succeed("k3s check-config")

      machine.succeed(

          "${pauseImage} | ctr image import -"

      )