Skip to content

slapos
slapos
Commit 0487aa97 authored by Benjamin Blanc's avatar Benjamin Blanc
Browse files
Options

testnode: change ip

parent 37d68cb3
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
software/erp5testnode/software.cfg
View file @ 0487aa97
[buildout] [buildout]
find-links += http://192.168.242.73:1235/ find-links += http://192.168.242.75:1235/
http://dist.repoze.org http://dist.repoze.org
http://www.nexedi.org/static/packages/source/ http://www.nexedi.org/static/packages/source/
...@@ -39,7 +39,7 @@ stop-on-error = true ...@@ -39,7 +39,7 @@ stop-on-error = true
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
#command = ${git:location}/bin/git clone --branch erp5testnode --quiet http://git.erp5.org/repos/slapos.git ${:location} #command = ${git:location}/bin/git clone --branch erp5testnode --quiet http://git.erp5.org/repos/slapos.git ${:location}
branch = erp5testnode-scalability branch = erp5testnode-scalability
repository = http://192.168.242.73:1236/slapdev.git repository = http://192.168.242.75:1236/slapdev.git
command = ${git:location}/bin/git clone --branch ${:branch} ${:repository} ${:location} command = ${git:location}/bin/git clone --branch ${:branch} ${:repository} ${:location}
update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && "${git:location}/bin/git" reset --hard @{upstream} update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && "${git:location}/bin/git" reset --hard @{upstream}
...@@ -67,7 +67,7 @@ stop-on-error = true ...@@ -67,7 +67,7 @@ stop-on-error = true
location = ${buildout:parts-directory}/testnode location = ${buildout:parts-directory}/testnode
branch = scalability-master2 branch = scalability-master2
#repository = http://git.erp5.org/repos/erp5.git #repository = http://git.erp5.org/repos/erp5.git
repository = http://192.168.242.73:1235/erp5.git repository = http://192.168.242.75:1235/erp5.git
command = ${git:location}/bin/git clone --branch ${:branch} ${:repository} ${:location} command = ${git:location}/bin/git clone --branch ${:branch} ${:repository} ${:location}
update-command = cd "${:location}" && "${git:location}/bin/git" fetch && "${git:location}/bin/git" reset --hard @{upstream} update-command = cd "${:location}" && "${git:location}/bin/git" fetch && "${git:location}/bin/git" reset --hard @{upstream}
......
stack/erp5/buildout.cfg
View file @ 0487aa97
...@@ -21,7 +21,7 @@ extends = ...@@ -21,7 +21,7 @@ extends =
http://svn.zope.org/repos/main/Zope/tags/2.12.25/versions.cfg http://svn.zope.org/repos/main/Zope/tags/2.12.25/versions.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
# not sure # not sure
http://192.168.242.73:1236/stack/erp5/buildout.cfg http://192.168.242.75:1236/stack/erp5/buildout.cfg
../../component/logrotate/buildout.cfg ../../component/logrotate/buildout.cfg
../../component/dcron/buildout.cfg ../../component/dcron/buildout.cfg
../../component/file/buildout.cfg ../../component/file/buildout.cfg
...@@ -149,7 +149,7 @@ parts = ...@@ -149,7 +149,7 @@ parts =
recipe = plone.recipe.command recipe = plone.recipe.command
stop-on-error = true stop-on-error = true
branch = erp5testnode-scalability branch = erp5testnode-scalability
repository = http://192.168.242.73:1236/slapdev.git repository = http://192.168.242.75:1236/slapdev.git
revision = revision =
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
#command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi #command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet http://git.erp5.org/repos/slapos.git "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --quiet --hard "${:revision}" ; fi
...@@ -160,7 +160,7 @@ update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet && ...@@ -160,7 +160,7 @@ update-command = cd "${:location}" && "${git:location}/bin/git" fetch --quiet &&
recipe = plone.recipe.command recipe = plone.recipe.command
stop-on-error = true stop-on-error = true
branch = scalability-master2 branch = scalability-master2
repository = http://192.168.242.73:1235/erp5.git repository = http://192.168.242.75:1235/erp5.git
revision = revision =
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet "${:repository}" "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --hard "${:revision}" ; fi command = "${git:location}/bin/git" clone --branch "${:branch}" --quiet "${:repository}" "${:location}" && if [ -n "${:revision}" ]; then cd "${:location}" && "${git:location}/bin/git" reset --hard "${:revision}" ; fi
...@@ -374,7 +374,7 @@ recipe = plone.recipe.command ...@@ -374,7 +374,7 @@ recipe = plone.recipe.command
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true stop-on-error = true
#repository = http://git.erp5.org/repos/erp5.git #repository = http://git.erp5.org/repos/erp5.git
repository = http://192.168.242.73:1235/erp5.git repository = http://192.168.242.75:1235/erp5.git
#branch = master #branch = master
branch = scalability-master2 branch = scalability-master2
revision = revision =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7