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
Tatuya Kamada
slapos
Commits
758b8cdb
Commit
758b8cdb
authored
Oct 21, 2013
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: uses the dev slapos.toolbox for the webrunner
parent
2458428f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
9 deletions
+6
-9
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+1
-5
software/slaprunner/development.cfg
software/slaprunner/development.cfg
+4
-3
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+1
-1
No files found.
software/slaprunner/common.cfg
View file @
758b8cdb
...
@@ -34,10 +34,6 @@ parts =
...
@@ -34,10 +34,6 @@ parts =
collective.recipe.template-egg
collective.recipe.template-egg
# shellinabox
# shellinabox
develop =
/opt/slapos.toolbox/
/opt/slaprunner/
####################
####################
## Node JS proxy
## Node JS proxy
...
@@ -120,7 +116,7 @@ mode = 0644
...
@@ -120,7 +116,7 @@ mode = 0644
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
download-only = true
download-only = true
md5sum = ac772d3a1cce4072acfabd563df449bb
#
md5sum = ac772d3a1cce4072acfabd563df449bb
filename = instance-resilient-test.cfg.jinja2
filename = instance-resilient-test.cfg.jinja2
mode = 0644
mode = 0644
...
...
software/slaprunner/development.cfg
View file @
758b8cdb
...
@@ -26,20 +26,21 @@ develop =
...
@@ -26,20 +26,21 @@ develop =
[slapos.toolbox-repository]
[slapos.toolbox-repository]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.toolbox.git
repository = http://git.erp5.org/repos/slapos.toolbox.git
branch =
kvmresiliency
branch =
slaprunner-paas
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
[slapos.cookbook-repository]
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git
repository = http://git.erp5.org/repos/slapos.git
branch = slaprunner
branch = slaprunner
-paas-test
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
# Used for resiliency tests only
# Used for resiliency tests only
[erp5.util-repository]
[erp5.util-repository]
recipe = slapos.recipe.build:gitclone
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/erp5.git
repository = http://git.erp5.org/repos/erp5.git
branch = scalability-master2
#branch = scalability-master2
revision = f9a812f4e97ffeed359bc5611366a5c8675ec749
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
#[slapos.core-repository]
#[slapos.core-repository]
...
...
software/slaprunner/software.cfg
View file @
758b8cdb
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
# 2/ Define list of trusted certificates for the cache.
# 2/ Define list of trusted certificates for the cache.
[buildout]
[buildout]
extends =
common
.cfg
extends =
development
.cfg
[networkcache]
[networkcache]
# signature certificates of the following uploaders.
# signature certificates of the following uploaders.
...
...
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