Revert "slaprunner: fix resiliency test, add development-mode (bool) parameter...

Revert "slaprunner: fix resiliency test, add development-mode (bool) parameter for easy build webrunner in webrunner"

This reverts commit 59966611.

software/slaprunner/common.cfg

@@ -47,14 +47,14 @@ parts =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
-md5sum = 37fe35675039e29c20838aedb8005fd0
+md5sum = bb7e0bf9959c4437ff1e23e645315ccf
 mode = 0644
 
 [template-runner]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = e0661b2532ecd36a56f18b7390d25599
+md5sum = 5fbdf6f9996d6cb948ba042e9dd6e43e
 mode = 0644
 
 [template-runner-import-script]
@@ -101,7 +101,7 @@ recipe = hexagonit.recipe.download
 ignore-existing = true
 url = ${:_profile_base_location_}/instance-resilient-test.cfg.jinja2
 download-only = true
-md5sum = 51248bb1bbf54ad11d0674ba40be18b4
+md5sum = fb8c45e5c35548331fb06c4633ec592a
 filename = instance-resilient-test.cfg.jinja2
 mode = 0644
 

software/slaprunner/instance-resilient-test.cfg.jinja2

@@ -42,8 +42,8 @@ mode = 755
 # Used to manually run the resilient test if we don't have a running testnode.
 recipe = slapos.cookbook:wrapper
 test-suite-title = slaprunner
-command-line = {{ bin_directory }}/runStandaloneResiliencyTest --test-suite-title=${:test-suite-title} ${deploy-scalability-test:test-parameters}
-wrapper-path = ${directory:bin}/runStandaloneResiliencyTest
+command-line = {{ bin_directory }}/runStandaloneResiliencyTestSuite --test-suite-title=${:test-suite-title} ${deploy-scalability-test:test-parameters}
+wrapper-path = ${directory:bin}/runStandaloneResiliencyTestSuite
 
 [request-resilient-instance]
 <= slap-connection
@@ -57,11 +57,10 @@ config-{{ key }} = {{ dumps(value) }}
 config-resiliency-backup-periodicity = */10 * * * *
 config-resilient-clone-number = 1
 config-ignore-known-hosts-file = true
-config-development-mode = {{ slapparameter_dict.get('development-mode', '') }}
 # XXX hardcoded
 #config-frontend-domain = google.com
 # XXX Hack to deploy Root Instance on the same computer as the type-test Instance
 sla-computer_guid = ${slap-connection:computer-id}
-return = backend-url
+return = backend_url
 
 [slap-parameter]

software/slaprunner/instance-runner.cfg

-{% set runner_port = 50005 -%}
-{% set proxy_port = 50000 -%}
-{% set dropbear_port = 22222 -%}
-{% set supervisord_port = 39986 -%}
-{% set runner_http_port = 9686 -%}
-{% set monitor_http_port = 8386 -%}
-{% set runner_software_type_list = ['runner-export', 'runner', 'default'] -%}
-
-{% if slapparameter_dict.get('development-mode', '') == 'true' -%}
-{%   if slap_software_type in runner_software_type_list -%}
-{%     set runner_port = 50025 -%}
-{%     set proxy_port = 50020 -%}
-{%     set dropbear_port = 22242 -%}
-{%     set supervisord_port = 39996 -%}
-{%     set runner_http_port = 9696 -%}
-{%     set monitor_http_port = 8396 -%}
-{%   elif slap_software_type == 'runner-import' -%}
-{%     set runner_port = 50026 -%}
-{%     set proxy_port = 50021 -%}
-{%     set dropbear_port = 22243 -%}
-{%     set supervisord_port = 39997 -%}
-{%     set runner_http_port = 9697 -%}
-{%     set monitor_http_port = 8397 -%}
-{%   endif -%}
-{% endif -%}
-
 [buildout]
 parts =
   nginx_conf
@@ -167,8 +141,8 @@ private_key = $${sshkeys-dropbear-runner:private-key}
 ipv4 = $${slap-network-information:local-ipv4}
 ipv6 = $${slap-network-information:global-ipv6}
 instance_root = $${runnerdirectory:instance-root}
-proxy_port = {{ proxy_port }}
-runner_port = {{ runner_port }}
+proxy_port = 50000
+runner_port = 50005
 partition-amount = $${slap-parameter:instance-amount}
 wrapper = $${directory:services}/slaprunner
 debug = $${slap-parameter:debug}
@@ -238,7 +212,7 @@ keygen-binary = ${dropbear:location}/bin/dropbearkey
 [dropbear-runner-server]
 recipe = slapos.cookbook:dropbear
 host = $${slap-network-information:global-ipv6}
-port = {{ dropbear_port }}
+port = 22222
 home = $${buildout:directory}
 wrapper = $${directory:bin}/runner_sshd
 shell = ${bash:location}/bin/bash
@@ -568,12 +542,12 @@ auto-deploy-instance = true
 autorun = false
 slaprunner-httpd-port = $${:monitor-port}
 # XXX - for backward compatibility, monitor-port was for slaprunner httpd server
-monitor-port = {{ runner_http_port }}
+monitor-port = 9686
 instance-name =
 monitor-cors-domains = 
 monitor-interface-url = 
 # XXX - define a new port for monitor here and use monitor-port for backward compatibility
-monitor-httpd-port = {{ monitor_http_port }}
+monitor-httpd-port = 8386
 
 [monitor-parameters]
 port = $${slap-parameter:monitor-port}
@@ -697,7 +671,7 @@ numprocs = 1
 path = $${shell:path}
 pidfile = $${directory:run}/supervisord.pid
 server = $${slaprunner:ipv4}:$${:port}
-port = {{ supervisord_port }}
+port = 39986
 slapgrid-cp = slapgrid-cp
 slapgrid-cp-command = $${slaprunner:slapos} node instance --all --cfg $${:slapos-cfg} --pidfile $${:slapgrid-cp-pid} --verbose --logfile $${:slapgrid-cp-log}
 slapgrid-cp-log = $${runnerdirectory:home}/instance.log

software/slaprunner/instance.cfg

@@ -26,7 +26,6 @@ context = key buildout buildout:bin-directory
           key develop_eggs_directory buildout:develop-eggs-directory
           key eggs_directory buildout:eggs-directory
           key slapparameter_dict slap-configuration:configuration
-          key slap_software_type slap-configuration:slap-software-type
           raw curl_executable_location ${curl:location}/bin/curl
           raw dash_executable_location ${dash:location}/bin/dash
           raw dcron_executable_location ${dcron:location}/sbin/crond

stack/resilient/buildout.cfg

@@ -69,7 +69,7 @@ mode = 0644
 [template-replicated]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template-replicated.cfg.in
-md5sum = e66b3f2316ac58348c35541b939b5656
+md5sum = 7a6234465ae845cb262d4f94c158764e
 mode = 0644
 destination = ${buildout:directory}/template-replicated.cfg.in
 

stack/resilient/template-replicated.cfg.in

@@ -90,10 +90,6 @@ config-number = {{id}}
 config-name = {{namebase}}{{id}}
 config-authorized-key = ${request-pbs-{{namebase}}-{{id}}:connection-ssh-key}
 config-on-notification = ${request-pbs-{{namebase}}-{{id}}:connection-feeds-url}${:pbs-notification-id}
-# set development mode
-{% if slapparameter_dict.has_key('development-mode') -%}
-config-development-mode = {{ slapparameter_dict.get('development-mode') }}
-{% endif -%}
 {% for key, value in monitor_dict.iteritems() -%}
 config-{{ key }} = {{ value }}
 {% endfor -%}