max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-30 09:36:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8138 from tweag/fix-installer-vm-tests

Browse source 
Fix the installer VM tests
This commit is contained in:
Eelco Dolstra 2023-03-31 16:59:24 +02:00 committed by GitHub
commit 49da2e8b0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/installer/default.nix
View file

@ -17,7 +17,7 @@ let
script = '' script = ''
tar -xf ./nix.tar.xz tar -xf ./nix.tar.xz
mv ./nix-* nix mv ./nix-* nix
./nix/install --no-daemon ./nix/install --no-daemon --no-channel-add
''; '';
}; };
@ -33,9 +33,9 @@ let
mockChannel = pkgs: mockChannel = pkgs:
pkgs.runCommandNoCC "mock-channel" {} '' pkgs.runCommandNoCC "mock-channel" {} ''
mkdir nixexprs mkdir nixexprs
mkdir $out mkdir -p $out/channel
echo -n 'someContent' > nixexprs/someFile echo -n 'someContent' > nixexprs/someFile
tar cvf - nixexprs | bzip2 > $out/nixexprs.tar.bz2 tar cvf - nixexprs | bzip2 > $out/channel/nixexprs.tar.bz2
''; '';
disableSELinux = "sudo setenforce 0"; disableSELinux = "sudo setenforce 0";
@ -198,7 +198,9 @@ let
$ssh "set -eux; $installScript" $ssh "set -eux; $installScript"
echo "Copying the mock channel" echo "Copying the mock channel"
scp -r -P 20022 $ssh_opts ${mockChannel pkgs} vagrant@localhost:channel # `scp -r` doesn't seem to work properly on some rhel instances, so let's
# use a plain tarpipe instead
tar -C ${mockChannel pkgs} -c channel | ssh -p 20022 $ssh_opts vagrant@localhost tar x -f-
echo "Testing Nix installation..." echo "Testing Nix installation..."
$ssh <<EOF $ssh <<EOF