summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-02-15 18:49:18 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2020-02-15 19:35:17 +0100
commitc391343fcd1515fd2d9b86a3267f7896522eb6a7 (patch)
tree0eadca3eddf9cba685ec2c8737cecac9f575edfd
parent4ca08a2a73e22de710c8b8959a66932ca2299c8f (diff)
downloadnixpkgs-c391343fcd1515fd2d9b86a3267f7896522eb6a7.tar
nixpkgs-c391343fcd1515fd2d9b86a3267f7896522eb6a7.tar.gz
nixpkgs-c391343fcd1515fd2d9b86a3267f7896522eb6a7.tar.bz2
nixpkgs-c391343fcd1515fd2d9b86a3267f7896522eb6a7.tar.lz
nixpkgs-c391343fcd1515fd2d9b86a3267f7896522eb6a7.tar.xz
nixpkgs-c391343fcd1515fd2d9b86a3267f7896522eb6a7.tar.zst
nixpkgs-c391343fcd1515fd2d9b86a3267f7896522eb6a7.zip
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.
-rw-r--r--nixos/doc/manual/release-notes/rl-2003.xml6
-rw-r--r--nixos/modules/installer/tools/nixos-build-vms/build-vms.nix2
2 files changed, 7 insertions, 1 deletions
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 <package>gcc7</package>-branch.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The <citerefentry><refentrytitle>nixos-build-vms</refentrytitle><manvolnum>8</manvolnum>
+     </citerefentry>-script now uses the python test-driver.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
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; };
 };