diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-18 18:44:48 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-09-18 18:44:48 +0200 |
commit | de419917a3bd72c7b60632bd77eff1201c546050 (patch) | |
tree | 972321bd451a0aaffe30c78033ffb1f9fb9d7388 /nixos/doc | |
parent | 1df2560dde3df459dd0e71883c5eac014100b0b0 (diff) | |
parent | 9064d9db001472e544536daf5ef7381ff4913d82 (diff) |
Merge master into staging-next
Diffstat (limited to 'nixos/doc')
-rw-r--r-- | nixos/doc/manual/development/running-nixos-tests-interactively.xml | 10 | ||||
-rw-r--r-- | nixos/doc/manual/development/writing-nixos-tests.xml | 2 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1809.xml | 8 |
3 files changed, 16 insertions, 4 deletions
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml index 862b364a6d79b..b25d3dcb9116d 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml @@ -19,6 +19,7 @@ starting VDE switch for network 1 > startAll > testScript > $machine->succeed("touch /tmp/foo") +> print($machine->succeed("pwd"), "\n") # Show stdout of command </screen> The function <command>testScript</command> executes the entire test script and drops you back into the test driver command line upon its completion. @@ -33,8 +34,11 @@ $ nix-build nixos/tests/login.nix -A driver $ ./result/bin/nixos-run-vms </screen> The script <command>nixos-run-vms</command> starts the virtual machines - defined by test. The root file system of the VMs is created on the fly and - kept across VM restarts in - <filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>. + defined by test. + </para> + + <para> + The machine state is kept across VM restarts in + <filename>/tmp/vm-state-</filename><varname>machinename</varname>. </para> </section> diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 5935fbc049bde..983f8f9cbe3e6 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -108,7 +108,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualis <programlisting> $machine->start; $machine->waitForUnit("default.target"); -$machine->succeed("uname") =~ /Linux/; +die unless $machine->succeed("uname") =~ /Linux/; </programlisting> The first line is actually unnecessary; machines are implicitly started when you first execute an action on them (such as <literal>waitForUnit</literal> diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 01421fc5dda7f..21ea98d012b80 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -452,6 +452,14 @@ inherit (pkgs.nixos { </para> </listitem> <listitem> + <para> + The Kubernetes package has been bumped to major version 1.11. + Please consult the + <link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release notes</link> + for details on new features and api changes. + </para> + </listitem> + <listitem> <para> The option <varname>services.kubernetes.apiserver.admissionControl</varname> was |