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

nixosTests: pass thru pkgs when available (#331873)

parents f46be218 727fafa6

nixos/tests/boot.nix

+7 −4
Original line number Diff line number Diff line
@@ -65,20 +65,22 @@ let 


  iso =

    (import ../lib/eval-config.nix {

      inherit system;

      modules = [

        ../modules/installer/cd-dvd/installation-cd-minimal.nix

        ../modules/testing/test-instrumentation.nix

        { nixpkgs.pkgs = pkgs; }

      ];

    }).config.system.build.isoImage;



  sd =

    (import ../lib/eval-config.nix {

      inherit system;

      modules = [

        ../modules/installer/sd-card/sd-image-x86_64.nix

        ../modules/testing/test-instrumentation.nix

        { sdImage.compressImage = false; }

        {

          sdImage.compressImage = false;

          nixpkgs.pkgs = pkgs;

        }

      ];

    }).config.system.build.sdImage;
@@ -109,7 +111,6 @@ let 
    let

      config =

        (import ../lib/eval-config.nix {

          inherit system;

          modules = [

            ../modules/installer/netboot/netboot.nix

            ../modules/testing/test-instrumentation.nix
@@ -118,6 +119,8 @@ let 
                "serial"

                "live.nixos.passwordHash=$6$jnwR50SkbLYEq/Vp$wmggwioAkfmwuYqd5hIfatZWS/bO6hewzNIwIrWcgdh7k/fhUzZT29Vil3ioMo94sdji/nipbzwEpxecLZw0d0" # "password"

              ];



              nixpkgs.pkgs = pkgs;

            }

            {

              key = "serial";

nixos/tests/ec2.nix

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ with import common/ec2.nix { inherit makeTest pkgs; }; 
let

  imageCfg =

    (import ../lib/eval-config.nix {

      inherit system;

      modules = [

        ../maintainers/scripts/ec2/amazon-image.nix

        ../modules/testing/test-instrumentation.nix
@@ -54,6 +53,8 @@ let 
            apacheHttpd.man

            valgrind.doc

          ]);



          nixpkgs.pkgs = pkgs;

        }

      ];

    }).config;

nixos/tests/image-contents.nix

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ with import common/ec2.nix { inherit makeTest pkgs; }; 
let

  config =

    (import ../lib/eval-config.nix {

      inherit system;

      modules = [

        ../modules/testing/test-instrumentation.nix

        ../modules/profiles/qemu-guest.nix
@@ -22,6 +21,7 @@ let 
          fileSystems."/".device = "/dev/disk/by-label/nixos";

          boot.loader.grub.device = "/dev/vda";

          boot.loader.timeout = 0;

          nixpkgs.pkgs = pkgs;

        }

      ];

    }).config;

nixos/tests/openstack-image.nix

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ with import common/ec2.nix { inherit makeTest pkgs; }; 
let

  image =

    (import ../lib/eval-config.nix {

      inherit system;

      modules = [

        ../maintainers/scripts/openstack/openstack-image.nix

        ../modules/testing/test-instrumentation.nix
@@ -22,6 +21,8 @@ let 
          system.extraDependencies = with pkgs; [

            stdenv

          ];



          nixpkgs.pkgs = pkgs;

        }

      ];

    }).config.system.build.openstackImage

nixos/tests/systemd-machinectl.nix

+2 −1
Original line number Diff line number Diff line
@@ -20,11 +20,12 @@ import ./make-test-python.nix ( 
        imports = [ ../modules/profiles/minimal.nix ];



        system.stateVersion = config.system.nixos.release;



        nixpkgs.pkgs = pkgs;

      };



    containerSystem =

      (import ../lib/eval-config.nix {

        inherit (pkgs) system;

        modules = [ container ];

      }).config.system.build.toplevel;