From c391343fcd1515fd2d9b86a3267f7896522eb6a7 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 15 Feb 2020 18:49:18 +0100 Subject: nixos/nixos-build-vms: switch to python test-driver In 0945178b3c6fd9e33002dd6e3c6f77dfca49565a we decided that Perl-based VM tests should be deprecated and will be removed between 20.03 and 20.09. So let's switch `nixos-build-vms(8)` to python as well (which is entirely interactive, so other scripts won't break). In my experience, the test-driver isn't used most of the time, so this patch is mainly supposed to get rid of the (probably misleading) deprecation warning when running `nixos-build-vms`. Apart from that, the interface for python's test-driver is way nicer. --- nixos/doc/manual/release-notes/rl-2003.xml | 6 ++++++ nixos/modules/installer/tools/nixos-build-vms/build-vms.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index caa0de3f05f..31f08d9da34 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -625,6 +625,12 @@ auth required pam_succeed_if.so uid >= 1000 quiet to a fairly old snapshot from the gcc7-branch. + + + The nixos-build-vms8 + -script now uses the python test-driver. + + diff --git a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix index c1028a0ad7e..90f0702f717 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix +++ b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix @@ -5,7 +5,7 @@ let nodes = import networkExpr; in -with import ../../../../lib/testing.nix { +with import ../../../../lib/testing-python.nix { inherit system; pkgs = import ../../../../.. { inherit system config; }; }; -- cgit 1.4.1