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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Joanne Hugé
slapos
Commits
fe566dc4
Commit
fe566dc4
authored
Oct 27, 2020
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5testnode: request a frontend for logs
And set it as log_frontend_url in testnode config
parent
93fa016f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
5 deletions
+23
-5
software/erp5testnode/buildout.hash.cfg
software/erp5testnode/buildout.hash.cfg
+1
-1
software/erp5testnode/instance-default.cfg
software/erp5testnode/instance-default.cfg
+22
-4
No files found.
software/erp5testnode/buildout.hash.cfg
View file @
fe566dc4
...
@@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e
...
@@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e
[template-default]
[template-default]
filename = instance-default.cfg
filename = instance-default.cfg
md5sum =
40364ff26e9284cea97a58f3cd8c75e3
md5sum =
e553b582cd51db90fcd5634bd055f042
software/erp5testnode/instance-default.cfg
View file @
fe566dc4
...
@@ -23,6 +23,7 @@ parts =
...
@@ -23,6 +23,7 @@ parts =
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
url = $${shellinabox-frontend:url}
url = $${shellinabox-frontend:url}
frontend-url = $${testnode-frontend:connection-secure_access}
frontend-url = $${testnode-frontend:connection-secure_access}
log-frontend-url = $${testnode-log-frontend:connection-secure_access}
[pwgen]
[pwgen]
recipe = slapos.cookbook:generate.password
recipe = slapos.cookbook:generate.password
...
@@ -63,6 +64,8 @@ httpd-log-directory = $${basedirectory:log}
...
@@ -63,6 +64,8 @@ httpd-log-directory = $${basedirectory:log}
httpd-software-directory = $${directory:software}
httpd-software-directory = $${directory:software}
httpd-cert-file = $${rootdirectory:etc}/httpd-public.crt
httpd-cert-file = $${rootdirectory:etc}/httpd-public.crt
httpd-key-file = $${rootdirectory:etc}/httpd-private.key
httpd-key-file = $${rootdirectory:etc}/httpd-private.key
frontend-url = $${testnode-frontend:connection-secure_access}
log-frontend-url = $${testnode-log-frontend:connection-secure_access}
configuration-file = $${rootdirectory:etc}/erp5testnode.cfg
configuration-file = $${rootdirectory:etc}/erp5testnode.cfg
log-file = $${basedirectory:log}/erp5testnode.log
log-file = $${basedirectory:log}/erp5testnode.log
...
@@ -212,22 +215,31 @@ recipe = collective.recipe.template
...
@@ -212,22 +215,31 @@ recipe = collective.recipe.template
input = inline: **
input = inline: **
output = $${directory:srv}/exporter.exclude
output = $${directory:srv}/exporter.exclude
[
testnode
-frontend]
[
request-shared
-frontend]
<= slap-connection
<= slap-connection
recipe = slapos.cookbook:requestoptional
recipe = slapos.cookbook:requestoptional
name = Test Node Frontend $${testnode:test-node-title}
# XXX We have hardcoded SR URL here.
# XXX We have hardcoded SR URL here.
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
software-url = http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
slave = true
slave = true
config-url = https://[$${testnode:httpd-ip}]:$${testnode:httpd-software-access-port}
config-https-only = true
config-https-only = true
#software-type = custom-personal
return = domain secure_access
return = domain secure_access
[testnode-frontend]
<= request-shared-frontend
name = Test Node Frontend $${testnode:test-node-title}
config-url = https://[$${testnode:httpd-ip}]:$${testnode:httpd-software-access-port}
[testnode-log-frontend]
<= request-shared-frontend
name = Test Node Logs Frontend $${testnode:test-node-title}
config-url = https://[$${testnode:httpd-ip}]:$${testnode:httpd-port}
[promises]
[promises]
recipe =
recipe =
instance-promises =
instance-promises =
$${shellinabox-frontend-listen-promise:name}
$${shellinabox-frontend-listen-promise:name}
$${testnode-log-frontend-promise:name}
[shellinabox-frontend-listen-promise]
[shellinabox-frontend-listen-promise]
<= monitor-promise-base
<= monitor-promise-base
...
@@ -236,6 +248,12 @@ name = $${:_buildout_section_name_}.py
...
@@ -236,6 +248,12 @@ name = $${:_buildout_section_name_}.py
config-hostname = $${shellinabox-frontend:hostname}
config-hostname = $${shellinabox-frontend:hostname}
config-port = $${shellinabox-frontend:port}
config-port = $${shellinabox-frontend:port}
[testnode-log-frontend-promise]
<= monitor-promise-base
module = check_url_available
name = $${:_buildout_section_name_}.py
config-url = $${testnode-log-frontend:connection-secure_access}
[slap-parameter]
[slap-parameter]
node-quantity = 1
node-quantity = 1
test-suite-master-url =
test-suite-master-url =
...
...
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