Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Rafael Monnerat
slapos
Commits
2290dd5f
Commit
2290dd5f
authored
Jan 29, 2020
by
Bryton Lacquement
🚪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: don't use builtin
"max" and "int" became directly accessible in slapos.recipe.template.
parent
1ae7ac3a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+2
-2
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+0
-1
software/slaprunner/template/supervisord.conf.in
software/slaprunner/template/supervisord.conf.in
+1
-1
No files found.
software/slaprunner/buildout.hash.cfg
View file @
2290dd5f
...
@@ -18,7 +18,7 @@ md5sum = 8b78e32b877d591400746ec7fd68ed4c
...
@@ -18,7 +18,7 @@ md5sum = 8b78e32b877d591400746ec7fd68ed4c
[template-runner]
[template-runner]
filename = instance-runner.cfg
filename = instance-runner.cfg
md5sum =
84b81c18c77af08d7e97b0b6da4ee105
md5sum =
be6d9d1c770a1ca63fce40093ffc25b4
[template-runner-import-script]
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
filename = template/runner-import.sh.jinja2
...
@@ -62,7 +62,7 @@ md5sum = 7645048216fcf957f7773534cd0408dc
...
@@ -62,7 +62,7 @@ md5sum = 7645048216fcf957f7773534cd0408dc
[template-supervisord]
[template-supervisord]
filename = template/supervisord.conf.in
filename = template/supervisord.conf.in
md5sum =
d294d0dafd265048399de6da8c96345f
md5sum =
28f69b57c2835bddfcfbe312563eef51
[template-listener-slapgrid]
[template-listener-slapgrid]
filename = template/listener_slapgrid.py.in
filename = template/listener_slapgrid.py.in
...
...
software/slaprunner/instance-runner.cfg
View file @
2290dd5f
...
@@ -820,7 +820,6 @@ template = ${template-supervisord:location}/${template-supervisord:filename}
...
@@ -820,7 +820,6 @@ template = ${template-supervisord:location}/${template-supervisord:filename}
rendered = $${directory:etc}/supervisord.conf
rendered = $${directory:etc}/supervisord.conf
context =
context =
import multiprocessing multiprocessing
import multiprocessing multiprocessing
import builtin __builtin__
section supervisord supervisord
section supervisord supervisord
key slapparameter_dict slap-configuration:configuration
key slapparameter_dict slap-configuration:configuration
key listener_slapgrid listener-slapgrid-bin:rendered
key listener_slapgrid listener-slapgrid-bin:rendered
...
...
software/slaprunner/template/supervisord.conf.in
View file @
2290dd5f
...
@@ -27,7 +27,7 @@ stdout_logfile = {{ supervisord['no_logfile'] }}
...
@@ -27,7 +27,7 @@ stdout_logfile = {{ supervisord['no_logfile'] }}
stderr_logfile = {{ supervisord['no_logfile'] }}
stderr_logfile = {{ supervisord['no_logfile'] }}
directory = {{ supervisord['directory'] }}
directory = {{ supervisord['directory'] }}
{# how many parallel build jobs to spawn when compiling software -#}
{# how many parallel build jobs to spawn when compiling software -#}
{% set njobs =
builtin.max(1, (multiprocessing.cpu_count() // builtin.
int(slapparameter_dict.get('cpu-usage-ratio', 4)))) -%}
{% set njobs =
max(1, (multiprocessing.cpu_count() //
int(slapparameter_dict.get('cpu-usage-ratio', 4)))) -%}
environment = PATH="{{- supervisord['path'] -}}",MAKEFLAGS="-j{{ njobs }}",NPY_NUM_BUILD_JOBS="{{ njobs }}",BUNDLE_JOBS="{{ njobs }}"
environment = PATH="{{- supervisord['path'] -}}",MAKEFLAGS="-j{{ njobs }}",NPY_NUM_BUILD_JOBS="{{ njobs }}",BUNDLE_JOBS="{{ njobs }}"
[program:{{- supervisord['slapgrid-cp'] -}}]
[program:{{- supervisord['slapgrid-cp'] -}}]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment