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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jean-Paul Smets
slapos
Commits
f94234c1
Commit
f94234c1
authored
Sep 22, 2014
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: update test to use current configuration + update version
parent
58ccdb3b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
14 deletions
+12
-14
software/slaprunner/TODO.txt
software/slaprunner/TODO.txt
+1
-0
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-5
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+5
-4
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+5
-5
No files found.
software/slaprunner/TODO.txt
View file @
f94234c1
- resilient sr: Cloned instances should not launch slapgrid-sr if it was not launched on export instance
- resilient sr: Cloned instances should not launch slapgrid-sr if it was not launched on export instance
- shellinabox password should be the same in all the resilient instances
- shellinabox password should be the same in all the resilient instances
- add test for parameter auto-deploy-instance
- add test for parameter auto-deploy-instance
- Add download facility in file browser
software/slaprunner/common.cfg
View file @
f94234c1
...
@@ -43,7 +43,7 @@ mode = 0644
...
@@ -43,7 +43,7 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in
output = ${buildout:directory}/template-runner.cfg.in
md5sum =
a1987b36e64cc021cb0cee47eee7dde2
md5sum =
403074d7563ff122fa9a5b29ec4ba8a8
mode = 0644
mode = 0644
[template-runner-import-script]
[template-runner-import-script]
...
@@ -214,7 +214,3 @@ recipe = zc.recipe.egg
...
@@ -214,7 +214,3 @@ recipe = zc.recipe.egg
interpreter = pythonwitheggs
interpreter = pythonwitheggs
eggs +=
eggs +=
supervisor
supervisor
[versions]
# We still need to use the older version.
slapos.core = 1.0.5
software/slaprunner/instance-runner.cfg
View file @
f94234c1
...
@@ -208,7 +208,7 @@ auto_deploy = True
...
@@ -208,7 +208,7 @@ auto_deploy = True
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
command-line = ${buildout:directory}/bin/slaprunnertest
command-line = ${buildout:directory}/bin/slaprunnertest
wrapper-path = $${directory:bin}/runTestSuite
wrapper-path = $${directory:bin}/runTestSuite
environment = RUNNER_CONFIG=$${slapos-
test-
cfg:rendered}
environment = RUNNER_CONFIG=$${slapos-cfg:rendered}
# Deploy dropbear (minimalist SSH server)
# Deploy dropbear (minimalist SSH server)
[sshkeys-directory]
[sshkeys-directory]
...
@@ -644,12 +644,12 @@ pidfile = $${directory:run}/supervisord.pid
...
@@ -644,12 +644,12 @@ pidfile = $${directory:run}/supervisord.pid
server = $${slaprunner:ipv4}:$${:port}
server = $${slaprunner:ipv4}:$${:port}
port = 39986
port = 39986
slapgrid-cp = slapgrid-cp
slapgrid-cp = slapgrid-cp
slapgrid-cp-command = $${slaprunner:slapos} node instance --all --cfg $${
slaprunner:slapos.
cfg} --pidfile $${:slapgrid-cp-pid} --verbose --logfile $${:slapgrid-cp-log}
slapgrid-cp-command = $${slaprunner:slapos} node instance --all --cfg $${
:slapos-
cfg} --pidfile $${:slapgrid-cp-pid} --verbose --logfile $${:slapgrid-cp-log}
slapgrid-cp-log = $${runnerdirectory:home}/instance.log
slapgrid-cp-log = $${runnerdirectory:home}/instance.log
slapgrid-cp-pid = $${directory:run}/slapgrid-cp.pid
slapgrid-cp-pid = $${directory:run}/slapgrid-cp.pid
slapgrid-cp-startretries = 0
slapgrid-cp-startretries = 0
slapgrid-sr = slapgrid-sr
slapgrid-sr = slapgrid-sr
slapgrid-sr-command = $${slaprunner:slapos} node software --all --cfg $${
slaprunner:slapos.
cfg} --pidfile $${:slapgrid-sr-pid} --verbose --logfile $${:slapgrid-sr-log}
slapgrid-sr-command = $${slaprunner:slapos} node software --all --cfg $${
:slapos-
cfg} --pidfile $${:slapgrid-sr-pid} --verbose --logfile $${:slapgrid-sr-log}
slapgrid-sr-log = $${runnerdirectory:home}/software.log
slapgrid-sr-log = $${runnerdirectory:home}/software.log
slapgrid-sr-pid = $${directory:run}/slapgrid-sr.pid
slapgrid-sr-pid = $${directory:run}/slapgrid-sr.pid
slapgrid-sr-startretries = 0
slapgrid-sr-startretries = 0
...
@@ -657,7 +657,7 @@ slapproxy = slapproxy
...
@@ -657,7 +657,7 @@ slapproxy = slapproxy
slapproxy-autorestart = true
slapproxy-autorestart = true
slapproxy-autostart = true
slapproxy-autostart = true
slapproxy-startsecs = 1
slapproxy-startsecs = 1
slapproxy-command = $${slaprunner:slapos} proxy start --logfile $${:slapproxy-log} --cfg $${
slaprunner:slapos.
cfg}
slapproxy-command = $${slaprunner:slapos} proxy start --logfile $${:slapproxy-log} --cfg $${
:slapos-
cfg}
slapproxy-log = $${directory:log}/slapproxy.log
slapproxy-log = $${directory:log}/slapproxy.log
socket_name = unix://$${:socket_path}
socket_name = unix://$${:socket_path}
socket_path = $${directory:tmp}/supervisord.sock
socket_path = $${directory:tmp}/supervisord.sock
...
@@ -665,6 +665,7 @@ startsecs = 0
...
@@ -665,6 +665,7 @@ startsecs = 0
# This file logs errors from listeners. Supervisord has its own logfile.
# This file logs errors from listeners. Supervisord has its own logfile.
# Processes should handle their logs by themselves
# Processes should handle their logs by themselves
stderr_logfile = $${directory:log}/supervisord-errors.log
stderr_logfile = $${directory:log}/supervisord-errors.log
slapos-cfg = $${slaprunner:slapos.cfg}
[supervisord-conf]
[supervisord-conf]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
...
software/slaprunner/software.cfg
View file @
f94234c1
...
@@ -27,11 +27,11 @@ smmap = 0.8.2
...
@@ -27,11 +27,11 @@ smmap = 0.8.2
z3c.recipe.scripts = 1.0.1
z3c.recipe.scripts = 1.0.1
# Required by:
# Required by:
# slapos.toolbox==0.
39.3
# slapos.toolbox==0.
40.1
GitPython = 0.3.2.RC1
GitPython = 0.3.2.RC1
# Required by:
# Required by:
# slapos.toolbox==0.
39.3
# slapos.toolbox==0.
40.1
atomize = 0.2.0
atomize = 0.2.0
# Required by:
# Required by:
...
@@ -39,9 +39,9 @@ atomize = 0.2.0
...
@@ -39,9 +39,9 @@ atomize = 0.2.0
ecdsa = 0.11
ecdsa = 0.11
# Required by:
# Required by:
# slapos.toolbox==0.
39.3
# slapos.toolbox==0.
40.1
feedparser = 5.1.3
feedparser = 5.1.3
# Required by:
# Required by:
# slapos.toolbox==0.
39.3
# slapos.toolbox==0.
40.1
paramiko = 1.14.1
paramiko = 1.14.1
\ No newline at end of file
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