diff options
author | Vika <vika@fireburn.ru> | 2020-11-30 20:00:29 +0300 |
---|---|---|
committer | Vika <vika@fireburn.ru> | 2020-12-03 13:28:09 +0300 |
commit | bcc196cae87dace4cb358a0e87f25145232771ba (patch) | |
tree | 7c33d538f7abf101597b150e7dfa1be2921d8c70 /nixos/tests/cloud-init.nix | |
parent | 8eb2551e51a610729ed51613f4fd981243c74848 (diff) | |
download | nixpkgs-bcc196cae87dace4cb358a0e87f25145232771ba.tar nixpkgs-bcc196cae87dace4cb358a0e87f25145232771ba.tar.gz nixpkgs-bcc196cae87dace4cb358a0e87f25145232771ba.tar.bz2 nixpkgs-bcc196cae87dace4cb358a0e87f25145232771ba.tar.lz nixpkgs-bcc196cae87dace4cb358a0e87f25145232771ba.tar.xz nixpkgs-bcc196cae87dace4cb358a0e87f25145232771ba.tar.zst nixpkgs-bcc196cae87dace4cb358a0e87f25145232771ba.zip |
nixos/tests/cloud-init: fix the erroring out
The test was broken for a 1.5 months apparently? Well, now it passes. Also apparently it's not flaky anymore.
Diffstat (limited to 'nixos/tests/cloud-init.nix')
-rw-r--r-- | nixos/tests/cloud-init.nix | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index a127be6dd85..d59d222974b 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -51,29 +51,31 @@ in makeTest { networking.hostName = ""; }; testScript = '' - machine.wait_for_unit("cloud-init.service") - machine.succeed("cat /tmp/cloudinit-write-file | grep -q 'cloudinit'") + # To wait until cloud-init terminates its run + unnamed.wait_for_unit("cloud-final.service") + + unnamed.succeed("cat /tmp/cloudinit-write-file | grep -q 'cloudinit'") # install snakeoil ssh key and provision .ssh/config file - machine.succeed("mkdir -p ~/.ssh") - machine.succeed( + unnamed.succeed("mkdir -p ~/.ssh") + unnamed.succeed( "cat ${snakeOilPrivateKey} > ~/.ssh/id_snakeoil" ) - machine.succeed("chmod 600 ~/.ssh/id_snakeoil") + unnamed.succeed("chmod 600 ~/.ssh/id_snakeoil") - machine.wait_for_unit("sshd.service") + unnamed.wait_for_unit("sshd.service") # we should be able to log in as the root user, as well as the created nixos user - machine.succeed( + unnamed.succeed( "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/id_snakeoil root@localhost 'true'" ) - machine.succeed( + unnamed.succeed( "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/id_snakeoil nixos@localhost 'true'" ) # test changing hostname via cloud-init worked assert ( - machine.succeed( + unnamed.succeed( "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/id_snakeoil nixos@localhost 'hostname'" ).strip() == "test" |