integration-tests: Make it easier to override pkgs and colmena

integration-tests/apply-local/default.nix

@@ -1,5 +1,7 @@
+{ pkgs ? import ../nixpkgs.nix }:
+
 let
-  tools = import ../tools.nix {
+  tools = pkgs.callPackage ../tools.nix {
     targets = [];
     prebuiltTarget = "deployer";
   };

integration-tests/apply/default.nix

@@ -1,5 +1,7 @@
+{ pkgs ? import ../nixpkgs.nix }:
+
 let
-  tools = import ../tools.nix {};
+  tools = pkgs.callPackage ../tools.nix {};
 in tools.makeTest {
   name = "colmena-apply";
 

integration-tests/apply/test-script.py

@@ -22,9 +22,8 @@ with subtest("Check that activation messages were logged correctly"):
     assert "must appear during activation" in logs
 
 with subtest("Check that we can still connect to the target nodes"):
-    deployer.succeed("ssh alpha true")
+    for node in targets:
-    deployer.succeed("ssh beta true")
+        deployer.succeed(f"ssh {node.name} true")
-    deployer.succeed("ssh gamma true")
 
 with subtest("Check that the new configurations are indeed applied"):
     for node in targets:

integration-tests/default.nix

@@ -1,7 +1,7 @@
 {
-  apply = import ./apply;
+  apply = import ./apply {};
-  apply-local = import ./apply-local;
+  apply-local = import ./apply-local {};
-  exec = import ./exec;
+  exec = import ./exec {};
-  flakes = import ./flakes;
+  flakes = import ./flakes {};
-  parallel = import ./parallel;
+  parallel = import ./parallel {};
 }

integration-tests/exec/default.nix

@@ -1,5 +1,7 @@
+{ pkgs ? import ../nixpkgs.nix }:
+
 let
-  tools = import ../tools.nix {};
+  tools = pkgs.callPackage ../tools.nix {};
 in tools.makeTest {
   name = "colmena-exec";
 

integration-tests/flakes/default.nix

@@ -1,5 +1,7 @@
+{ pkgs ? import ../nixpkgs.nix }:
+
 let
-  tools = import ../tools.nix {
+  tools = pkgs.callPackage ../tools.nix {
     targets = [ "alpha" ];
   };
 in tools.makeTest {

integration-tests/nixpkgs.nix

@@ -0,0 +1,13 @@
+let
+  lock = builtins.fromJSON (builtins.readFile ../flake.lock);
+  pinned = fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
+    sha256 = lock.nodes.nixpkgs.locked.narHash;
+  };
+in import pinned {
+  overlays = [
+    (final: prev: {
+      colmena = final.callPackage ../default.nix { };
+    })
+  ];
+}

integration-tests/parallel/default.nix

@@ -1,5 +1,7 @@
+{ pkgs ? import ../nixpkgs.nix }:
+
 let
-  tools = import ../tools.nix {};
+  tools = pkgs.callPackage ../tools.nix {};
 in tools.makeTest {
   name = "colmena-parallel";
 

integration-tests/tools.nix

@@ -11,6 +11,9 @@
 , deployers ? [ "deployer" ]           # Nodes configured as deployers (with Colmena and pre-built system closure)
 , targets ? [ "alpha" "beta" "gamma" ] # Nodes configured as targets (minimal config)
 , prebuiltTarget ? "alpha"             # Target node to prebuild system closure for, or null
+
+, pkgs ? if insideVm then import <nixpkgs> {} else throw "Must specify pkgs"
+, colmena ? if !insideVm then pkgs.colmena else throw "Cannot eval inside VM"
 }:
 
 with builtins;
@@ -18,17 +21,8 @@ with builtins;
 assert elem "deployer" deployers;
 
 let
-  lock = builtins.fromJSON (builtins.readFile ../flake.lock);
-  pinned = if insideVm then <nixpkgs> else fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
-    sha256 = lock.nodes.nixpkgs.locked.narHash;
-  };
-  pkgs = import pinned {};
   inherit (pkgs) lib;
 
-  colmena =
-    if !insideVm then import ../default.nix { inherit pkgs; }
-    else throw "Cannot be used inside the VM";
   colmenaExec = "${colmena}/bin/colmena";
 
   sshKeys = import (pkgs.path + "/nixos/tests/ssh-keys.nix") pkgs;