From 489d0e43c76ae595565c7b801cf0644e7f3f5219 Mon Sep 17 00:00:00 2001
From: Stephan Maka <stephan@spaceboyz.net>
Date: Thu, 13 Jun 2019 02:55:45 +0200
Subject: [PATCH] extended-tests: ssh with explicit private key, force re-run

---
 main.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/main.nix b/main.nix
index f366e47..4e25e4b 100644
--- a/main.nix
+++ b/main.nix
@@ -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/passed10
+    cp ${generatedNix}/pkgs/artiq-version.nix $TMPDIR/passed11
     HASH=`nix-hash --type sha256 --base32 $TMPDIR`
     echo \"$HASH\" > $out
     '';
@@ -97,6 +97,7 @@ in
       mkfifo $LOCKCTL/lockctl
 
       cat $LOCKCTL/lockctl | ${pkgs.openssh}/bin/ssh \
+        -i $HOME/.ssh/id_rsa \
         -o UserKnownHostsFile=$HOME/.ssh/known_hosts \
         sb@rpi-1 \
         'flock /tmp/board_lock-kc705-1 -c "echo Ok; cat"' \
@@ -123,7 +124,7 @@ in
       )
 
       mkdir $out
-      cp ${generatedNix}/pkgs/artiq-version.nix $out/passed10
+      cp ${generatedNix}/pkgs/artiq-version.nix $out/passed11
       '';
     };
   }