Commit 8b7b454f authored by Jondy Zhao's avatar Jondy Zhao

Custom slaprunner for cygwin.

parent a9195d89
[buildout] [buildout]
extends = extends =
../../component/cloud9/buildout.cfg
../../component/dash/buildout.cfg
../../component/dropbear/buildout.cfg ../../component/dropbear/buildout.cfg
../../component/git/buildout.cfg
../../component/lxml-python/buildout.cfg
../../stack/flask.cfg ../../stack/flask.cfg
../../stack/shacache-client.cfg ../../stack/shacache-client.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
...@@ -25,7 +21,7 @@ md5sum = 5307e4200f044ae57b504ad68444491c ...@@ -25,7 +21,7 @@ md5sum = 5307e4200f044ae57b504ad68444491c
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 output = ${buildout:directory}/template-runner.cfg
md5sum = 91d6550c43b7a43a999724af4650ae40 # md5sum = abe03d8604e42a4f88965667017ebb90
mode = 0644 mode = 0644
[eggs] [eggs]
......
[buildout] [buildout]
parts = parts =
cloud9
slaprunner slaprunner
test-runner test-runner
sshkeys-dropbear sshkeys-dropbear
...@@ -9,7 +8,6 @@ parts = ...@@ -9,7 +8,6 @@ parts =
publish-connection-informations publish-connection-informations
slaprunner-promise slaprunner-promise
slaprunner-frontend-promise slaprunner-frontend-promise
cloud9-promise
dropbear-promise dropbear-promise
symlinks symlinks
...@@ -55,17 +53,6 @@ recipe = slapos.cookbook:generate.password ...@@ -55,17 +53,6 @@ recipe = slapos.cookbook:generate.password
storage-path = $${directory:etc}/.rcode storage-path = $${directory:etc}/.rcode
bytes = 4 bytes = 4
# Deploy cloud9 and slaprunner
[cloud9]
recipe = slapos.cookbook:cloud9
ip = $${slap-network-information:global-ipv6}
port = 30000
wrapper = $${directory:services}/cloud9
working-directory = $${runnerdirectory:home}
git-binary = ${git:location}/bin/git
node-binary = ${nodejs:location}/bin/node
cloud9 = ${cloud9:executable}
[slaprunner] [slaprunner]
recipe = slapos.cookbook:slaprunner recipe = slapos.cookbook:slaprunner
slaprunner = ${buildout:directory}/bin/slaprunner slaprunner = ${buildout:directory}/bin/slaprunner
...@@ -73,7 +60,7 @@ slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr ...@@ -73,7 +60,7 @@ slapgrid_sr = ${buildout:directory}/bin/slapgrid-sr
slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp slapgrid_cp = ${buildout:directory}/bin/slapgrid-cp
slapproxy = ${buildout:directory}/bin/slapproxy slapproxy = ${buildout:directory}/bin/slapproxy
supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl
git-binary = ${git:location}/bin/git git-binary = /bin/git
slapos.cfg = $${directory:etc}/slapos.cfg slapos.cfg = $${directory:etc}/slapos.cfg
working-directory = $${runnerdirectory:home} working-directory = $${runnerdirectory:home}
project-directory = $${runnerdirectory:project} project-directory = $${runnerdirectory:project}
...@@ -90,7 +77,7 @@ ipv6 = $${slap-network-information:global-ipv6} ...@@ -90,7 +77,7 @@ ipv6 = $${slap-network-information:global-ipv6}
proxy_port = 50000 proxy_port = 50000
runner_port = 50000 runner_port = 50000
partition-amount = $${slap-parameter:instance-amount} partition-amount = $${slap-parameter:instance-amount}
cloud9-url = $${cloud9:access-url} cloud9-url =
wrapper = $${directory:services}/slaprunner wrapper = $${directory:services}/slaprunner
debug = $${slap-parameter:debug} debug = $${slap-parameter:debug}
...@@ -181,15 +168,8 @@ port = $${slaprunner:runner_port} ...@@ -181,15 +168,8 @@ port = $${slaprunner:runner_port}
recipe = slapos.cookbook:check_url_available recipe = slapos.cookbook:check_url_available
path = $${directory:promises}/slaprunner_frontend path = $${directory:promises}/slaprunner_frontend
url = $${request-frontend:connection-site_url} url = $${request-frontend:connection-site_url}
dash_path = ${dash:location}/bin/dash dash_path = /bin/dash
curl_path = ${curl:location}/bin/curl curl_path = /bin/curl
[cloud9-promise]
recipe = slapos.cookbook:check_url_available
path = $${directory:promises}/cloud9
url = http://$${cloud9:ip}:$${cloud9:port}
dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl
[dropbear-promise] [dropbear-promise]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
......
...@@ -49,7 +49,7 @@ buildout-versions = 1.7 ...@@ -49,7 +49,7 @@ buildout-versions = 1.7
cns.recipe.symlink = 0.2.3 cns.recipe.symlink = 0.2.3
gitdb = 0.5.4 gitdb = 0.5.4
hexagonit.recipe.cmmi = 1.6 hexagonit.recipe.cmmi = 1.6
inotifyx = 0.2.0 inotifyx = 0.2.0-1
lxml = 3.0.1 lxml = 3.0.1
meld3 = 0.6.10 meld3 = 0.6.10
netaddr = 0.7.10 netaddr = 0.7.10
...@@ -89,7 +89,7 @@ hexagonit.recipe.download = 1.6nxd002 ...@@ -89,7 +89,7 @@ hexagonit.recipe.download = 1.6nxd002
# Required by: # Required by:
# slapos.core==0.34 # slapos.core==0.34
netifaces = 0.8 netifaces = 0.8-1
# Required by: # Required by:
# slapos.toolbox==0.34.0 # slapos.toolbox==0.34.0
...@@ -97,7 +97,7 @@ paramiko = 1.9.0 ...@@ -97,7 +97,7 @@ paramiko = 1.9.0
# Required by: # Required by:
# slapos.toolbox==0.34.0 # slapos.toolbox==0.34.0
psutil = 0.6.1 psutil = 0.6.2
# Required by: # Required by:
# slapos.core==0.34 # slapos.core==0.34
......
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