Compare commits

...

2 Commits

Author SHA1 Message Date
Astro 0dae4220bf force extended-tests re-run 2019-06-12 00:08:11 +02:00
Astro f7926ccddf extended-tests: explicitly pass ssh UserKnownHostsFile 2019-06-12 00:07:39 +02:00
1 changed files with 7 additions and 3 deletions

View File

@ -27,7 +27,7 @@ let
generateTestOkHash = pkgs.runCommand "generate-test-ok-hash" { buildInputs = [ pkgs.nix ]; }
''
TMPDIR=`mktemp -d`
cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed8
cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed9
HASH=`nix-hash --type sha256 --base32 $TMPDIR`
echo \"$HASH\" > $out
'';
@ -96,7 +96,11 @@ in
LOCKCTL=$(mktemp -d)
mkfifo $LOCKCTL/lockctl
cat $LOCKCTL/lockctl | ${pkgs.openssh}/bin/ssh rpi-1 'flock /tmp/board_lock-kc705-1 -c "echo Ok; cat"' | (
cat $LOCKCTL/lockctl | ${pkgs.openssh}/bin/ssh \
-o UserKnownHostsFile=$HOME/.ssh/known_hosts \
rpi-1 \
'flock /tmp/board_lock-kc705-1 -c "echo Ok; cat"' \
| (
# End remote flock via FIFO
atexit_unlock() {
echo > $LOCKCTL/lockctl
@ -119,7 +123,7 @@ in
)
mkdir $out
cp ${generatedNix}/pkgs/artiq-version.nix $out/passed8
cp ${generatedNix}/pkgs/artiq-version.nix $out/passed9
'';
};
}