diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-07 00:02:20 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-07 00:02:20 +0000 |
commit | fd7a8aedb05d043f27206beaf915d1f9397396cf (patch) | |
tree | cca548b680db40c3197fb2d07363ac37bff21358 /nixos/tests | |
parent | e72d04004ef65961e8b14e3d9a4debb2c4ddde70 (diff) | |
parent | 747224bf39576965deed4ec55b255e146815bcc2 (diff) | |
download | nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.tar nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.tar.gz nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.tar.bz2 nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.tar.lz nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.tar.xz nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.tar.zst nixlib-fd7a8aedb05d043f27206beaf915d1f9397396cf.zip |
Merge master into staging-next
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/all-tests.nix | 2 | ||||
-rw-r--r-- | nixos/tests/incus/container.nix | 4 | ||||
-rw-r--r-- | nixos/tests/incus/preseed.nix | 4 | ||||
-rw-r--r-- | nixos/tests/incus/socket-activated.nix | 4 | ||||
-rw-r--r-- | nixos/tests/incus/virtual-machine.nix | 4 | ||||
-rw-r--r-- | nixos/tests/lxd/container.nix | 4 | ||||
-rw-r--r-- | nixos/tests/lxd/nftables.nix | 6 | ||||
-rw-r--r-- | nixos/tests/lxd/preseed.nix | 2 | ||||
-rw-r--r-- | nixos/tests/lxd/ui.nix | 4 | ||||
-rw-r--r-- | nixos/tests/lxd/virtual-machine.nix | 4 |
10 files changed, 23 insertions, 15 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e0572e3bed9c..0322ec9dc551 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -163,7 +163,7 @@ in { btrbk-no-timer = handleTest ./btrbk-no-timer.nix {}; btrbk-section-order = handleTest ./btrbk-section-order.nix {}; budgie = handleTest ./budgie.nix {}; - buildbot = handleTest ./buildbot.nix {}; + buildbot = handleTestOn [ "x86_64-linux" ] ./buildbot.nix {}; buildkite-agents = handleTest ./buildkite-agents.nix {}; c2fmzq = handleTest ./c2fmzq.nix {}; caddy = handleTest ./caddy.nix {}; diff --git a/nixos/tests/incus/container.nix b/nixos/tests/incus/container.nix index 49a22c08aad1..2d3fa49e5bd1 100644 --- a/nixos/tests/incus/container.nix +++ b/nixos/tests/incus/container.nix @@ -14,7 +14,9 @@ in { name = "incus-container"; - meta.maintainers = with lib.maintainers; [ adamcstephens ]; + meta = { + maintainers = lib.teams.lxc.members; + }; nodes.machine = { ... }: { virtualisation = { diff --git a/nixos/tests/incus/preseed.nix b/nixos/tests/incus/preseed.nix index 47b2d0cd6228..a488d71f3c92 100644 --- a/nixos/tests/incus/preseed.nix +++ b/nixos/tests/incus/preseed.nix @@ -3,7 +3,9 @@ import ../make-test-python.nix ({ pkgs, lib, ... } : { name = "incus-preseed"; - meta.maintainers = with lib.maintainers; [ adamcstephens ]; + meta = { + maintainers = lib.teams.lxc.members; + }; nodes.machine = { lib, ... }: { virtualisation = { diff --git a/nixos/tests/incus/socket-activated.nix b/nixos/tests/incus/socket-activated.nix index 4d25b26a15f5..fca536b7054f 100644 --- a/nixos/tests/incus/socket-activated.nix +++ b/nixos/tests/incus/socket-activated.nix @@ -3,7 +3,9 @@ import ../make-test-python.nix ({ pkgs, lib, ... } : { name = "incus-socket-activated"; - meta.maintainers = with lib.maintainers; [ adamcstephens ]; + meta = { + maintainers = lib.teams.lxc.members; + }; nodes.machine = { lib, ... }: { virtualisation = { diff --git a/nixos/tests/incus/virtual-machine.nix b/nixos/tests/incus/virtual-machine.nix index bfa116679d43..be5746ef63e2 100644 --- a/nixos/tests/incus/virtual-machine.nix +++ b/nixos/tests/incus/virtual-machine.nix @@ -19,7 +19,9 @@ in { name = "incus-virtual-machine"; - meta.maintainers = with lib.maintainers; [ adamcstephens ]; + meta = { + maintainers = lib.teams.lxc.members; + }; nodes.machine = {...}: { virtualisation = { diff --git a/nixos/tests/lxd/container.nix b/nixos/tests/lxd/container.nix index 0ebe73d872f2..ef9c3f4bbee7 100644 --- a/nixos/tests/lxd/container.nix +++ b/nixos/tests/lxd/container.nix @@ -18,8 +18,8 @@ let in { name = "lxd-container"; - meta = with pkgs.lib.maintainers; { - maintainers = [ patryk27 adamcstephens ]; + meta = { + maintainers = lib.teams.lxc.members; }; nodes.machine = { lib, ... }: { diff --git a/nixos/tests/lxd/nftables.nix b/nixos/tests/lxd/nftables.nix index d98bd4952906..e6ce4089d719 100644 --- a/nixos/tests/lxd/nftables.nix +++ b/nixos/tests/lxd/nftables.nix @@ -5,11 +5,11 @@ # iptables to nftables requires a full reboot, which is a bit hard inside NixOS # tests. -import ../make-test-python.nix ({ pkgs, ...} : { +import ../make-test-python.nix ({ pkgs, lib, ...} : { name = "lxd-nftables"; - meta = with pkgs.lib.maintainers; { - maintainers = [ patryk27 ]; + meta = { + maintainers = lib.teams.lxc.members; }; nodes.machine = { lib, ... }: { diff --git a/nixos/tests/lxd/preseed.nix b/nixos/tests/lxd/preseed.nix index 7d89b9f56daa..fb80dcf3893e 100644 --- a/nixos/tests/lxd/preseed.nix +++ b/nixos/tests/lxd/preseed.nix @@ -4,7 +4,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... } : name = "lxd-preseed"; meta = { - maintainers = with lib.maintainers; [ adamcstephens ]; + maintainers = lib.teams.lxc.members; }; nodes.machine = { lib, ... }: { diff --git a/nixos/tests/lxd/ui.nix b/nixos/tests/lxd/ui.nix index ff651725ba70..c442f44ab81c 100644 --- a/nixos/tests/lxd/ui.nix +++ b/nixos/tests/lxd/ui.nix @@ -1,8 +1,8 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: { name = "lxd-ui"; - meta = with pkgs.lib.maintainers; { - maintainers = [ jnsgruk ]; + meta = { + maintainers = lib.teams.lxc.members; }; nodes.machine = { lib, ... }: { diff --git a/nixos/tests/lxd/virtual-machine.nix b/nixos/tests/lxd/virtual-machine.nix index 93705e9350c5..2a9dd8fcdbf6 100644 --- a/nixos/tests/lxd/virtual-machine.nix +++ b/nixos/tests/lxd/virtual-machine.nix @@ -18,8 +18,8 @@ let in { name = "lxd-virtual-machine"; - meta = with pkgs.lib.maintainers; { - maintainers = [adamcstephens]; + meta = { + maintainers = lib.teams.lxc.members; }; nodes.machine = {lib, ...}: { |