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
Guillaume Hervier
slapos
Commits
760df98a
Commit
760df98a
authored
Mar 03, 2014
by
Nicolas Wavrant
Committed by
Cédric Le Ninivin
Apr 10, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: do not use slaprunner.test recipe anymore
parent
aea2c7e4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-1
software/slaprunner/instance-runner.cfg
software/slaprunner/instance-runner.cfg
+9
-3
No files found.
software/slaprunner/common.cfg
View file @
760df98a
...
@@ -44,7 +44,7 @@ mode = 0644
...
@@ -44,7 +44,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 =
2bf878b9e658cfb59b44ad1ee107e4d4
md5sum =
35244440c627151428210ab2645df556
mode = 0644
mode = 0644
[instance-runner-import]
[instance-runner-import]
...
...
software/slaprunner/instance-runner.cfg
View file @
760df98a
...
@@ -7,7 +7,6 @@ parts =
...
@@ -7,7 +7,6 @@ parts =
ca-shellinabox
ca-shellinabox
gunicorn-launcher
gunicorn-launcher
gunicorn-graceful
gunicorn-graceful
test-runner
sshkeys-dropbear-runner
sshkeys-dropbear-runner
dropbear-server-add-authorized-key
dropbear-server-add-authorized-key
sshkeys-authority
sshkeys-authority
...
@@ -19,6 +18,7 @@ parts =
...
@@ -19,6 +18,7 @@ parts =
symlinks
symlinks
shellinabox
shellinabox
slapos-cfg
slapos-cfg
slapos-test-cfg
slapos-repo-config
slapos-repo-config
cron-entry-prepare-software
cron-entry-prepare-software
deploy-instance-parameters
deploy-instance-parameters
...
@@ -176,7 +176,6 @@ knowledge0_file = $${buildout:directory}/$${public:filename}
...
@@ -176,7 +176,6 @@ knowledge0_file = $${buildout:directory}/$${public:filename}
[test-runner]
[test-runner]
<= slaprunner
<= slaprunner
recipe = slapos.cookbook:slaprunner.test
slaprunnertest = ${buildout:directory}/bin/slaprunnertest
slaprunnertest = ${buildout:directory}/bin/slaprunnertest
slapos.cfg = $${directory:etc}/slapos-test.cfg
slapos.cfg = $${directory:etc}/slapos-test.cfg
working-directory = $${runnerdirectory:test}
working-directory = $${runnerdirectory:test}
...
@@ -187,7 +186,6 @@ proxy_port = 8602
...
@@ -187,7 +186,6 @@ proxy_port = 8602
wrapper = $${directory:bin}/runTestSuite
wrapper = $${directory:bin}/runTestSuite
etc_dir = $${directory:test}
etc_dir = $${directory:test}
# Deploy dropbear (minimalist SSH server)
# Deploy dropbear (minimalist SSH server)
[sshkeys-directory]
[sshkeys-directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
...
@@ -485,6 +483,14 @@ mode = 700
...
@@ -485,6 +483,14 @@ mode = 700
context =
context =
section slaprunner slaprunner
section slaprunner slaprunner
[slapos-test-cfg]
recipe = slapos.recipe.template:jinja2
template = ${slapos-cfg-template:location}/${slapos-cfg-template:filename}
rendered = $${slaprunner:slapos.cfg}
mode = 700
context =
section slaprunner test-runner
[shellinabox]
[shellinabox]
recipe = slapos.cookbook:shellinabox
recipe = slapos.cookbook:shellinabox
ipv6 = $${slap-network-information:global-ipv6}
ipv6 = $${slap-network-information:global-ipv6}
...
...
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