Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
879c4e3a
Commit
879c4e3a
authored
Aug 29, 2018
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: promise to wait for apache testrunner URL to be returned
Otherwise instanciation can finish too early.
parent
d17377ca
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+2
-2
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+1
-1
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+9
-0
No files found.
stack/erp5/buildout.hash.cfg
View file @
879c4e3a
...
@@ -74,7 +74,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
...
@@ -74,7 +74,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
[template-erp5]
[template-erp5]
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
b326c11f013b459c3d1b49c5f1c68e8b
md5sum =
cb61073c6696f286f5da8a355ebc4335
[template-zeo]
[template-zeo]
filename = instance-zeo.cfg.in
filename = instance-zeo.cfg.in
...
@@ -82,7 +82,7 @@ md5sum = 3e650915959ff31c9c13c84069bbcd35
...
@@ -82,7 +82,7 @@ md5sum = 3e650915959ff31c9c13c84069bbcd35
[template-zope]
[template-zope]
filename = instance-zope.cfg.in
filename = instance-zope.cfg.in
md5sum =
61899bbe151ce7d86ff1c08d280c5689
md5sum =
5c5f193fb30837327bea361172c5dc96
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
...
...
stack/erp5/instance-erp5.cfg.in
View file @
879c4e3a
...
@@ -345,7 +345,7 @@ deadlock-debugger-password = {{ dumps(deadlock_debugger_password) }}
...
@@ -345,7 +345,7 @@ deadlock-debugger-password = {{ dumps(deadlock_debugger_password) }}
[default-balancer-test-runner-url-list]
[default-balancer-test-runner-url-list]
recipe =
recipe =
default =
{{ dumps(["ERROR: not published yet"]) }}
default =
not-ready
[gen-password]
[gen-password]
recipe = slapos.cookbook:generate.password
recipe = slapos.cookbook:generate.password
...
...
stack/erp5/instance-zope.cfg.in
View file @
879c4e3a
...
@@ -160,6 +160,15 @@ command-line-extra =
...
@@ -160,6 +160,15 @@ command-line-extra =
{% endfor -%}
{% endfor -%}
--zserver_address_list '{{ ','.join(zserver_address_list) }}'
--zserver_address_list '{{ ','.join(zserver_address_list) }}'
--zserver_frontend_url_list '{{ ','.join(slapparameter_dict['test-runner-apache-url-list']) }}'
--zserver_frontend_url_list '{{ ','.join(slapparameter_dict['test-runner-apache-url-list']) }}'
[{{ section("promise-test-runner-apache-url") }}]
# promise to wait for apache partition to have returned the parameter
recipe = slapos.cookbook:check_parameter
value = {{ slapparameter_dict['test-runner-apache-url-list'] }}
expected-not-value = not-ready
path = ${directory:promises}/${:_buildout_section_name_}
expected-value =
{%- endif %}
{%- endif %}
{%- endif %}
{%- endif %}
...
...
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