aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2024-05-23 21:16:40 +0200
committerPierre Bourdon <delroth@gmail.com>2024-05-23 21:16:40 +0200
commit6260563bed1dc09db72b8bf51bccb42b031dd015 (patch)
treefd22ab01abe1fe355ce0a8c7a69184c62e0e7bc7
parent79121e0c44d74de6f2f2841770d31090a6ea3c6b (diff)
nixos/tests: enable remoteBuilds tests against Nix 2.18
Fixes #321. Change-Id: I60812aec9f9b68ab742413835c581d3b53432b9b
-rw-r--r--tests/nixos/default.nix27
1 files changed, 24 insertions, 3 deletions
diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
index 9dd888916..354413a7c 100644
--- a/tests/nixos/default.nix
+++ b/tests/nixos/default.nix
@@ -62,7 +62,14 @@ in
};
});
- # TODO: (nixpkgs update) remoteBuilds_remote_2_18 = ...
+ remoteBuilds_remote_2_18 = runNixOSTestFor "x86_64-linux" ({ lib, pkgs, ... }: {
+ name = "remoteBuilds_remote_2_18";
+ imports = [ ./remote-builds.nix ];
+ builders.config = { lib, pkgs, ... }: {
+ imports = [ checkOverrideNixVersion ];
+ nix.package = lib.mkForce pkgs.nixVersions.nix_2_18;
+ };
+ });
# Test our Nix as a builder for clients that are older
@@ -84,7 +91,14 @@ in
};
});
- # TODO: (nixpkgs update) remoteBuilds_local_2_18 = ...
+ remoteBuilds_local_2_18 = runNixOSTestFor "x86_64-linux" ({ lib, pkgs, ... }: {
+ name = "remoteBuilds_local_2_18";
+ imports = [ ./remote-builds.nix ];
+ nodes.client = { lib, pkgs, ... }: {
+ imports = [ checkOverrideNixVersion ];
+ nix.package = lib.mkForce pkgs.nixVersions.nix_2_18;
+ };
+ });
# End remoteBuilds tests
@@ -110,7 +124,14 @@ in
};
};
- # TODO: (nixpkgs update) remoteBuildsSshNg_remote_2_18 = ...
+ remoteBuildsSshNg_remote_2_18 = runNixOSTestFor "x86_64-linux" {
+ name = "remoteBuildsSshNg_remote_2_18";
+ imports = [ ./remote-builds-ssh-ng.nix ];
+ builders.config = { lib, pkgs, ... }: {
+ imports = [ checkOverrideNixVersion ];
+ nix.package = lib.mkForce pkgs.nixVersions.nix_2_18;
+ };
+ };
# Test our Nix as a builder for clients that are older