From c811cf643f19b8067dcbf16d05987c439e8961b4 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 4 Sep 2023 15:19:34 -0400 Subject: [PATCH] nixos/tests/lxd: disable virtual-machine test on aarch64 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/lxd/default.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e25552b7d637..97410e220786 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -446,7 +446,7 @@ in { loki = handleTest ./loki.nix {}; luks = handleTest ./luks.nix {}; lvm2 = handleTest ./lvm2 {}; - lxd = pkgs.recurseIntoAttrs (handleTest ./lxd {}); + lxd = pkgs.recurseIntoAttrs (handleTest ./lxd { inherit handleTestOn; }); lxd-image-server = handleTest ./lxd-image-server.nix {}; #logstash = handleTest ./logstash.nix {}; lorri = handleTest ./lorri/default.nix {}; diff --git a/nixos/tests/lxd/default.nix b/nixos/tests/lxd/default.nix index e63e199aca90..20afdd5e48bb 100644 --- a/nixos/tests/lxd/default.nix +++ b/nixos/tests/lxd/default.nix @@ -2,10 +2,11 @@ system ? builtins.currentSystem, config ? {}, pkgs ? import ../../.. {inherit system config;}, + handleTestOn, }: { container = import ./container.nix {inherit system pkgs;}; nftables = import ./nftables.nix {inherit system pkgs;}; preseed = import ./preseed.nix {inherit system pkgs;}; ui = import ./ui.nix {inherit system pkgs;}; - virtual-machine = import ./virtual-machine.nix { inherit system pkgs; }; + virtual-machine = handleTestOn ["x86_64-linux"] ./virtual-machine.nix { inherit system pkgs; }; }