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
423c2403
Commit
423c2403
authored
10 years ago
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into erp5-component
parents
f75d3dbf
c3c29845
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
6 deletions
+21
-6
software/erp5-util-testing/instance.cfg
software/erp5-util-testing/instance.cfg
+6
-0
software/erp5-util-testing/software.cfg
software/erp5-util-testing/software.cfg
+1
-1
software/slapos-testing/instance.cfg
software/slapos-testing/instance.cfg
+8
-1
software/slapos-testing/software.cfg
software/slapos-testing/software.cfg
+4
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+2
-2
No files found.
software/erp5-util-testing/instance.cfg
View file @
423c2403
[buildout]
[buildout]
parts =
parts =
erp5-util-setup
test-runner
test-runner
sh-environment
sh-environment
...
@@ -24,6 +25,11 @@ git-executable = ${git:location}/bin/git
...
@@ -24,6 +25,11 @@ git-executable = ${git:location}/bin/git
<= download-source
<= download-source
repository = ${erp5-util-repository:location}
repository = ${erp5-util-repository:location}
[erp5-util-setup]
recipe = plone.recipe.command
command = echo "Updating setup...";cd $${erp5-util:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n
update-command = $${:command}
[test-runner]
[test-runner]
recipe = slapos.cookbook:egg_test
recipe = slapos.cookbook:egg_test
run-test-suite = $${create-directory:bin}/runTestSuite
run-test-suite = $${create-directory:bin}/runTestSuite
...
...
This diff is collapsed.
Click to expand it.
software/erp5-util-testing/software.cfg
View file @
423c2403
...
@@ -45,7 +45,7 @@ branch = master
...
@@ -45,7 +45,7 @@ branch = master
[template]
[template]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
md5sum =
e8b87313667c944567029c61c9c0bd2e
md5sum =
194278f0a65d692bd165a909e6c83148
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 640
mode = 640
...
...
This diff is collapsed.
Click to expand it.
software/slapos-testing/instance.cfg
View file @
423c2403
[buildout]
[buildout]
parts =
parts =
slapos.core-setup
slapos-test-runner
slapos-test-runner
sh-environment
sh-environment
...
@@ -24,6 +25,12 @@ git-executable = ${git:location}/bin/git
...
@@ -24,6 +25,12 @@ git-executable = ${git:location}/bin/git
<= download-source
<= download-source
repository = ${slapos.core-repository:location}
repository = ${slapos.core-repository:location}
[slapos.core-setup]
recipe = plone.recipe.command
command = echo "Updating setup...";cd $${slapos.core:location}; export PATH="$${slapos-test-runner:prepend-path}:$PATH"; export CPPFLAGS="$${environment:CPPFLAGS}"; export LDFLAGS="$${environment:LDFLAGS}"; export PYTHONPATH="$${environment:PYTHONPATH}"; python setup.py test -n; python setup.py test -n; python setup.py test -n; python setup.py test -n
update-command = $${:command}
[slapos.recipe.template]
[slapos.recipe.template]
<= download-source
<= download-source
repository = ${slapos.recipe.template-repository:location}
repository = ${slapos.recipe.template-repository:location}
...
...
This diff is collapsed.
Click to expand it.
software/slapos-testing/software.cfg
View file @
423c2403
...
@@ -25,6 +25,7 @@ eggs =
...
@@ -25,6 +25,7 @@ eggs =
erp5.util
erp5.util
slapos.cookbook
slapos.cookbook
collective.recipe.template
collective.recipe.template
plone.recipe.command
entry-points =
entry-points =
runTestSuite=erp5.util.testsuite:runTestSuite
runTestSuite=erp5.util.testsuite:runTestSuite
scripts =
scripts =
...
@@ -61,7 +62,7 @@ branch = master
...
@@ -61,7 +62,7 @@ branch = master
[template]
[template]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
md5sum =
7a8be25961238f8e11d5de95d2f05598
md5sum =
1330c8ccd1dab485aadba5e688d2b2e1
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 640
mode = 640
...
@@ -106,7 +107,6 @@ Werkzeug = 0.9.4
...
@@ -106,7 +107,6 @@ Werkzeug = 0.9.4
buildout-versions = 1.7
buildout-versions = 1.7
cmd2 = 0.6.7
cmd2 = 0.6.7
collective.recipe.template = 1.10
collective.recipe.template = 1.10
erp5.util = 0.4.36
itsdangerous = 0.23
itsdangerous = 0.23
lxml = 3.3.0beta3
lxml = 3.3.0beta3
meld3 = 0.6.10
meld3 = 0.6.10
...
@@ -130,6 +130,8 @@ bpython = 0.12
...
@@ -130,6 +130,8 @@ bpython = 0.12
# slapos.core==1.0.0
# slapos.core==1.0.0
cliff = 1.5.2
cliff = 1.5.2
erp5.util = 0.4.36
# Required by:
# Required by:
# slapos.cookbook==0.85
# slapos.cookbook==0.85
inotifyx = 0.2.0-1
inotifyx = 0.2.0-1
...
...
This diff is collapsed.
Click to expand it.
stack/erp5/buildout.cfg
View file @
423c2403
...
@@ -141,7 +141,7 @@ parts =
...
@@ -141,7 +141,7 @@ parts =
[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 = erp5
branch = erp5
-component
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
[check-recipe]
[check-recipe]
...
@@ -333,7 +333,7 @@ repository_id_list = erp5
...
@@ -333,7 +333,7 @@ repository_id_list = erp5
[erp5]
[erp5]
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 =
master
branch =
erp5-component
git-executable = ${git:location}/bin/git
git-executable = ${git:location}/bin/git
[fix-products-paths]
[fix-products-paths]
...
...
This diff is collapsed.
Click to expand it.
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