nix-community/disko
1
1
Fork 0
mirror of https://github.com/nix-community/disko.git synced 2024-09-19 02:27:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #341 from nix-community/zfs-hostid

Browse Source 
do not set networking.hostId in vm tests by default
This commit is contained in:
Jörg Thalheim 2023-09-02 18:41:18 +02:00 committed by GitHub
commit a4bf32f6f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.mergify.yml
View File

@ -1,37 +1,7 @@
queue_rules: queue_rules:
- name: default - name: default
merge_conditions: merge_conditions:
- check-success=Evaluate flake.nix - check-success=buildbot/nix-eval
- check-success=check bcachefs [x86_64-linux]
- check-success=check boot-raid1 [x86_64-linux]
- check-success=check btrfs-subvolumes [x86_64-linux]
- check-success=check cli [x86_64-linux]
- check-success=check complex [x86_64-linux]
- check-success=check gpt-bios-compat [x86_64-linux]
- check-success=check hybrid [x86_64-linux]
- check-success=check hybrid-tmpfs-on-root [x86_64-linux]
- check-success=check legacy-table [x86_64-linux]
- check-success=check luks-btrfs-subvolumes [x86_64-linux]
- check-success=check luks-lvm [x86_64-linux]
- check-success=check lvm-raid [x86_64-linux]
- check-success=check lvm-sizes-sort [x86_64-linux]
- check-success=check make-disk-image [x86_64-linux]
- check-success=check make-disk-image-impure [x86_64-linux]
- check-success=check mdadm [x86_64-linux]
- check-success=check module [x86_64-linux]
- check-success=check multi-device-no-deps [x86_64-linux]
- check-success=check negative-size [x86_64-linux]
- check-success=check shellcheck [x86_64-linux]
- check-success=check simple-efi [x86_64-linux]
- check-success=check standalone [x86_64-linux]
- check-success=check swap [x86_64-linux]
- check-success=check tmpfs [x86_64-linux]
- check-success=check with-lib [x86_64-linux]
- check-success=check zfs [x86_64-linux]
- check-success=check zfs-over-legacy [x86_64-linux]
- check-success=package default [x86_64-linux]
- check-success=package disko [x86_64-linux]
- check-success=package disko-doc [x86_64-linux]
defaults: defaults:
actions: actions:
queue: queue:

1
lib/tests.nix
View File

@ -101,7 +101,6 @@ let
# config for tests to make them run faster or work at all # config for tests to make them run faster or work at all
documentation.enable = false; documentation.enable = false;
hardware.enableAllFirmware = lib.mkForce false; hardware.enableAllFirmware = lib.mkForce false;
networking.hostId = "8425e349"; # from profiles/base.nix, needed for zfs
boot.initrd.preDeviceCommands = '' boot.initrd.preDeviceCommands = ''
echo -n 'secretsecret' > /tmp/secret.key echo -n 'secretsecret' > /tmp/secret.key
''; '';

1
tests/cli.nix
View File

@ -6,6 +6,7 @@ diskoLib.testLib.makeDiskoTest {
name = "cli"; name = "cli";
disko-config = ../example/complex.nix; disko-config = ../example/complex.nix;
extraSystemConfig = { extraSystemConfig = {
networking.hostId = "8425e349";
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!
fileSystems."/zfs_fs".options = [ "nofail" ]; # TODO find out why we need this! fileSystems."/zfs_fs".options = [ "nofail" ]; # TODO find out why we need this!
}; };

1
tests/complex.nix
View File

@ -6,6 +6,7 @@ diskoLib.testLib.makeDiskoTest {
name = "complex"; name = "complex";
disko-config = ../example/complex.nix; disko-config = ../example/complex.nix;
extraSystemConfig = { extraSystemConfig = {
networking.hostId = "8425e349";
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!
fileSystems."/zfs_fs".options = [ "nofail" ]; # TODO find out why we need this! fileSystems."/zfs_fs".options = [ "nofail" ]; # TODO find out why we need this!
}; };

1
tests/module.nix
View File

@ -6,6 +6,7 @@ diskoLib.testLib.makeDiskoTest {
name = "module"; name = "module";
disko-config = ../example/complex.nix; disko-config = ../example/complex.nix;
extraSystemConfig = { extraSystemConfig = {
networking.hostId = "8425e349";
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!
}; };
testMode = "module"; testMode = "module";

3
tests/zfs-over-legacy.nix
View File

@ -4,6 +4,9 @@
diskoLib.testLib.makeDiskoTest { diskoLib.testLib.makeDiskoTest {
inherit pkgs; inherit pkgs;
name = "zfs-over-legacy"; name = "zfs-over-legacy";
extraSystemConfig = {
networking.hostId = "8425e349";
};
disko-config = ../example/zfs-over-legacy.nix; disko-config = ../example/zfs-over-legacy.nix;
extraTestScript = '' extraTestScript = ''
machine.succeed("test -e /zfs_fs"); machine.succeed("test -e /zfs_fs");

1
tests/zfs.nix
View File

@ -6,6 +6,7 @@ diskoLib.testLib.makeDiskoTest {
name = "zfs"; name = "zfs";
disko-config = ../example/zfs.nix; disko-config = ../example/zfs.nix;
extraSystemConfig = { extraSystemConfig = {
networking.hostId = "8425e349";
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this! fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!
}; };
extraTestScript = '' extraTestScript = ''