yvan-sraka/lix-installer
0
0
Fork 0
forked from lix-project/lix-installer
Code Pull requests Activity

tests: Fix container and VM tests

Browse source 
The `nix-installer-static` package is now named `lix-installer-static`.
However, the uninstall binary is still called `nix-installer`

Change-Id: I60fd2ab84867beaa8cf527e88c953298ec703881
This commit is contained in:
Artemis Tosini 2024-06-02 00:22:38 +00:00
parent 85bbfe3d7c
commit 9705a12ec0
Signed by untrusted user: artemist
GPG key ID: EE5227935FE3FF18
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nix/tests/container-test/default.nix
View file

@ -54,7 +54,7 @@ let
machine.copy_from_host("${image.tarball}", "/image") machine.copy_from_host("${image.tarball}", "/image")
machine.succeed("mkdir -p /test") machine.succeed("mkdir -p /test")
machine.copy_from_host("${image.tester}", "/test/Dockerfile") machine.copy_from_host("${image.tester}", "/test/Dockerfile")
machine.copy_from_host("${nix-installer-static}", "/test/nix-installer") machine.copy_from_host("${lix-installer-static}", "/test/lix-installer")
machine.copy_from_host("${binaryTarball.${system}}", "/test/binary-tarball") machine.copy_from_host("${binaryTarball.${system}}", "/test/binary-tarball")
machine.succeed("${containerTool} import /image default") machine.succeed("${containerTool} import /image default")
machine.succeed("${containerTool} build -t test /test") machine.succeed("${containerTool} build -t test /test")

4
nix/tests/container-test/default/Dockerfile
View file

@ -3,7 +3,7 @@ COPY lix-installer /lix-installer
RUN chmod +x /lix-installer RUN chmod +x /lix-installer
COPY binary-tarball /binary-tarball COPY binary-tarball /binary-tarball
RUN mv /binary-tarball/nix-*.tar.xz nix.tar.xz RUN mv /binary-tarball/nix-*.tar.xz nix.tar.xz
RUN /nix-installer/bin/lix-installer install linux --logger pretty --log-directive lix_installer=debug --nix-package-url file:///nix.tar.xz --init none --extra-conf "sandbox = false" --no-confirm -vvv RUN /lix-installer/bin/lix-installer install linux --logger pretty --log-directive lix_installer=debug --nix-package-url file:///nix.tar.xz --init none --extra-conf "sandbox = false" --no-confirm -vvv
ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin" ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin"
RUN nix-build --no-substitute -E 'derivation { name = "foo"; system = "x86_64-linux"; builder = "/bin/sh"; args = ["-c" "echo foobar > $out"]; }' RUN nix-build --no-substitute -E 'derivation { name = "foo"; system = "x86_64-linux"; builder = "/bin/sh"; args = ["-c" "echo foobar > $out"]; }'
RUN /nix/lix-installer uninstall --no-confirm RUN /nix/nix-installer uninstall --no-confirm

4
nix/tests/vm-test/default.nix
View file

@ -515,7 +515,7 @@ let
uninstallScript = test.uninstall; uninstallScript = test.uninstall;
preuninstallScript = test.preuninstall or "echo \"Not Applicable\""; preuninstallScript = test.preuninstall or "echo \"Not Applicable\"";
uninstallCheckScript = test.uninstallCheck; uninstallCheckScript = test.uninstallCheck;
installer = nix-installer-static; installer = lix-installer-static;
binaryTarball = binaryTarball.${system}; binaryTarball = binaryTarball.${system};
} }
'' ''
@ -573,7 +573,7 @@ let
fi fi
echo "Copying installer..." echo "Copying installer..."
scp -P 20022 $ssh_opts $installer/bin/nix-installer vagrant@localhost:nix-installer scp -P 20022 $ssh_opts $installer/bin/lix-installer vagrant@localhost:nix-installer
echo "Copying nix tarball..." echo "Copying nix tarball..."
scp -P 20022 $ssh_opts $binaryTarball/nix-*.tar.xz vagrant@localhost:nix.tar.xz scp -P 20022 $ssh_opts $binaryTarball/nix-*.tar.xz vagrant@localhost:nix.tar.xz