Unverified Commit d7df9adf authored by Robert Hensing's avatar Robert Hensing Committed by GitHub
Browse files

nixos/tests: respect meta.hydraPlatforms (#503721)

parents 1e10431d ec2c7515

nixos/release.nix

+22 −12
Original line number Diff line number Diff line
@@ -43,12 +43,17 @@ let 
      pkgs = import ./.. { inherit system; };

      callTest =

        config:

        let

          inherit (config) test;

        in

        lib.optionalAttrs (builtins.elem system (getPlatforms test)) (

          if attrNamesOnly then

          hydraJob config.test

            hydraJob test

          else

            {

            ${system} = hydraJob config.test;

          };

              ${system} = hydraJob test;

            }

        );

    }

    // {

      # for typechecking of the scripts and evaluation of
@@ -58,12 +63,17 @@ let 
        pkgs = import ./.. { inherit system; };

        callTest =

          config:

          let

            inherit (config) driver;

          in

          lib.optionalAttrs (builtins.elem system (getPlatforms driver)) (

            if attrNamesOnly then

            hydraJob config.test

              hydraJob driver

            else

              {

              ${system} = hydraJob config.driver;

            };

                ${system} = hydraJob driver;

              }

          );

      };

    };

nixos/tests/nixos-test-driver/containers.nix

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
{

  name = "containers";

  meta.maintainers = with pkgs.lib.maintainers; [ jfly ];

  # https://github.com/NixOS/infra/issues/987

  meta.hydraPlatforms = [ ];



  nodes = {

    n1 = {

nixos/tests/test-containers-bittorrent.nix

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ in 
    maintainers = [

      lib.maintainers.kmein

    ];

    # https://github.com/NixOS/infra/issues/987

    hydraPlatforms = [ ];

  };



  containers = {