Skip to content

slapos
slapos
Commit 37ee4278 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin
Browse files
Options

slaprunner: export path and makeflags in resiliency import script.

parent 1d9711d0
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
software/slaprunner/common.cfg
View file @ 37ee4278
...@@ -52,7 +52,7 @@ mode = 0644 ...@@ -52,7 +52,7 @@ mode = 0644
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/runner-import.sh.jinja2 url = ${:_profile_base_location_}/template/runner-import.sh.jinja2
download-only = true download-only = true
md5sum = 5c3395201fd9d3dd2a369476e5849723 md5sum = a3def21a49aa0338eca8c965bbc60909
filename = runner-import.sh.jinja2 filename = runner-import.sh.jinja2
mode = 0644 mode = 0644
......
software/slaprunner/template/runner-import.sh.jinja2
View file @ 37ee4278
...@@ -46,6 +46,9 @@ $srv_directory/runner-import-restore || RESTORE_EXIT_CODE=$? ...@@ -46,6 +46,9 @@ $srv_directory/runner-import-restore || RESTORE_EXIT_CODE=$?
echo "Updating slapproxy database, software release and instances..." echo "Updating slapproxy database, software release and instances..."
HOME="{{ directory['home'] }}" HOME="{{ directory['home'] }}"
# XXX Hardcoded
export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
export MAKEFLAGS=-j4
SLAPOS="{{ directory['bin'] }}/slapos" SLAPOS="{{ directory['bin'] }}/slapos"
# XXX hardcoded # XXX hardcoded
SQLITE3="$HOME/software_release/parts/sqlite3/bin/sqlite3" SQLITE3="$HOME/software_release/parts/sqlite3/bin/sqlite3"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7