slaprunner: remove haadcoded path in import script

Since the introduction of shared parts, there is no guarantee about
the location of sqlite3 binary.

software/slaprunner/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = c44a7481bb85e3258128afe3fcf23f44
+md5sum = 317c49bf451e80bf0f9d44baa603861e
 
 [template-runner]
 filename = instance-runner.cfg
@@ -22,11 +22,11 @@ md5sum = 85ea0b78fd18428c242438ebe95f980b
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
-md5sum = 3c80e21dda146b4cbee103b0a3f6935b
+md5sum = fc22e2d2f03ce58631f157a5b4943e15
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in
-md5sum = 2704ac1a93480f69827312637022d0e0
+md5sum = ce067aee4a727830304a8407af293477
 
 [instance-runner-export]
 filename = instance-runner-export.cfg.in

software/slaprunner/instance-runner-import.cfg.in

@@ -107,6 +107,7 @@ context =
   section supervisord supervisord
   raw  output_log_file ${directory:log}/${:resilient-log-basename}
   raw  shell_binary {{ bash_executable_location }}
+  raw  sqlite3_binary {{ sqlite3_executable_location }}
   raw  rsync_binary {{ rsync_executable_location }}
   raw  restore_exit_code_file ${:restore-exit-code-file}
   raw  restore_error_message_file ${:restore-error-message-file}

software/slaprunner/instance.cfg

@@ -76,6 +76,7 @@ context =
   raw importer_script_path ${template-runner-import-script:location}/${template-runner-import-script:filename}
   raw buildout_executable_location ${buildout:executable}
   raw bash_executable_location ${bash:location}/bin/bash
+  raw sqlite3_executable_location ${sqlite3:location}/bin/sqlite3
   raw rsync_executable_location ${rsync:location}/bin/rsync
   raw pbsready_import_template_path ${pbsready-import:output}
   raw software_release_information_template ${template-resilient-software-release-information:destination}/${template-resilient-software-release-information:filename}

software/slaprunner/template/runner-import.sh.jinja2

@@ -134,8 +134,7 @@ HOME='{{ directory["home"] }}'
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 export MAKEFLAGS=-j4
 SLAPOS='{{ directory["bin"] }}'/slapos
-# XXX hardcoded
-SQLITE3="$HOME/software_release/parts/sqlite3/bin/sqlite3"
+SQLITE3="{{ sqlite3_binary }}"
 DATABASE="$HOME/srv/runner/proxy.db"
 db_query () {
   # Try opening locked tables for 5 seconds to prevent "database is locked" error