M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

extended-tests: ssh with explicit private key, force re-run

This commit is contained in:
Astro 2019-06-13 02:55:45 +02:00
parent f250aff384
commit 489d0e43c7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main.nix
View File

@ -27,7 +27,7 @@ let
generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; } generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; }
'' ''
TMPDIR=`mktemp -d` TMPDIR=`mktemp -d`
cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed10 cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed11
HASH=`nix-hash --type sha256 --base32 $TMPDIR` HASH=`nix-hash --type sha256 --base32 $TMPDIR`
echo \"$HASH\" > $out echo \"$HASH\" > $out
''; '';
@ -97,6 +97,7 @@ in
mkfifo $LOCKCTL/lockctl mkfifo $LOCKCTL/lockctl
cat $LOCKCTL/lockctl | ${pkgs.openssh}/bin/ssh \ cat $LOCKCTL/lockctl | ${pkgs.openssh}/bin/ssh \
-i $HOME/.ssh/id_rsa \
-o UserKnownHostsFile=$HOME/.ssh/known_hosts \ -o UserKnownHostsFile=$HOME/.ssh/known_hosts \
sb@rpi-1 \ sb@rpi-1 \
'flock /tmp/board_lock-kc705-1 -c "echo Ok; cat"' \ 'flock /tmp/board_lock-kc705-1 -c "echo Ok; cat"' \
@ -123,7 +124,7 @@ in
) )
mkdir $out mkdir $out
cp ${generatedNix}/pkgs/artiq-version.nix $out/passed10 cp ${generatedNix}/pkgs/artiq-version.nix $out/passed11
''; '';
}; };
} }