From 6d5b7d7e3eda81a7e9ec8a2c1c4cd7d62436193a Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 27 Jan 2022 18:48:25 -0800 Subject: [PATCH] integration-tests: Only enable documentation build in apply test Otherwise it takes too long :/ --- integration-tests/apply/hive.nix | 2 ++ integration-tests/tools.nix | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/apply/hive.nix b/integration-tests/apply/hive.nix index 341d5d0..0d9249a 100644 --- a/integration-tests/apply/hive.nix +++ b/integration-tests/apply/hive.nix @@ -79,6 +79,8 @@ in { environment.systemPackages = [ testPkg ]; + documentation.nixos.enable = lib.mkForce true; + system.activationScripts.colmena-test.text = '' echo "must appear during activation" ''; diff --git a/integration-tests/tools.nix b/integration-tests/tools.nix index 51552c5..63eaafe 100644 --- a/integration-tests/tools.nix +++ b/integration-tests/tools.nix @@ -55,8 +55,6 @@ let ]; }; - documentation.nixos.enable = lib.mkForce true; - services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = [ sshKeys.snakeOilPublicKey @@ -79,7 +77,7 @@ let targetConfig = { lib, ... }: { nix.binaryCaches = lib.mkForce []; - documentation.nixos.enable = lib.mkForce true; + documentation.nixos.enable = lib.mkOverride 60 true; services.openssh.enable = true; users.users.root.openssh.authorizedKeys.keys = [ @@ -105,7 +103,7 @@ let (modulesPath + "/testing/test-instrumentation.nix") ]; - documentation.nixos.enable = false; + documentation.nixos.enable = lib.mkOverride 55 false; boot.loader.grub.enable = false; system.nixos.revision = lib.mkForce "constant-nixos-revision";