nixos/test-driver: use an argument instead of the out env-var#153854
nixos/test-driver: use an argument instead of the out env-var#153854tfc merged 5 commits intoNixOS:masterfrom
Conversation
github-actions
bot
added
the
6.topic: nixos
ofborg
bot
added
10.rebuild-darwin: 0
|
Oh drat, I just implemented my own fix as well... If we don't end up going with that, I also cleaned up the screenshot logic, we should probably incorporate that here as well. |
marijanp
force-pushed
the
test-driver-out-dir
branch
from
1677361 to
68b2e23
Compare
|
@ofborg test nat.firewall networking.scripted.link installer.simpleProvided installer.separateBootFat networking.scripted.virtual printing keymap.azerty keymap.dvorak-programmer boot-stage1 installer.swraid keymap.neo nfs4.simple i3wm udisks2 networking.networkd.loopback containers-ip ecryptfs login installer.simpleLabels php.httpd zfs.installer predictable-interface-names.unpredictable predictable-interface-names.unpredictableNetworkd mutableUsers |
We could split it up into two PRs each for the respective change? |
marijanp
force-pushed
the
test-driver-out-dir
branch
from
68b2e23 to
7765670
Compare
|
@ofborg test nat.firewall networking.scripted.link installer.simpleProvided installer.separateBootFat networking.scripted.virtual printing keymap.azerty keymap.dvorak-programmer boot-stage1 installer.swraid keymap.neo nfs4.simple i3wm udisks2 networking.networkd.loopback containers-ip ecryptfs login installer.simpleLabels php.httpd zfs.installer predictable-interface-names.unpredictable predictable-interface-names.unpredictableNetworkd mutableUsers |
|
@ofborg test pantheon boot.biosCdrom boot.uefiUsb networking.networkd.static latestKernel.login networking.networkd.dhcpSimple networking.networkd.sit env switchTest hibernate predictable-interface-names.predictable gnome networking.networkd.bridge networking.networkd.privacy plasma5 systemd-networkd-ipv6-prefix-delegation lightdm installer.simple installer.btrfsSimple installer.btrfsSubvols sway networking.networkd.link networking.scripted.privacy |
|
@ofborg test nat.firewall-conntrack networking.scripted.sit networking.networkd.virtual networking.scripted.dhcpSimple firewall firefox networking.scripted.macvlan proxy firefox-esr sddm.default boot.uefiCdrom networking.scripted.static networking.scripted.routes installer.lvm networking.networkd.vlan containers-imperative boot.biosUsb xfce networking.networkd.dhcpOneIf installer.simpleUefiSystemdBoot keymap.qwertz gnome-xorg shadow networking.networkd.macvlan networking.networkd.routes |
|
@ofborg test nfs3.simple php.fpm fontconfig-default-fonts networking.scripted.bond nano keymap.dvorak installer.luksroot networking.scripted.bridge docker simple chromium networking.scripted.dhcpOneIf networking.networkd.bond php.pcre nat.standalone openssh networking.scripted.vlan ipv6 installer.separateBoot misc predictable-interface-names.predictableNetworkd networking.scripted.loopback keymap.colemak installer.btrfsSubvolDefault |
|
This broke test output, now screenshots and such are not copied to $out. #156910 fixes this. |
3 participants
Motivation for this change
Bug #153766, read comment
Things done
Instead of reading the
outenvironment variable in the test-driver's Machine::copy_from_vm and Machine::screenshot functions, a output-directory is used.The output-directory is a mandatory command-line argument that needs to be passed to the test-driver.
When makeTest invokes the test-driver the
outenvironment variable is passed as the argument.sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes