delete: run test part

software/erp5testnode/testsuite/fluentTest/instance-caddy-fluentd.cfg.in

 [buildout]
 parts =
-  slapos-test-runner
   directory
   fluentdConfig
   fluentd-service
   caddy-service
   publish-connection-information
-  runTest-instance
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -28,13 +26,6 @@ home = $${:etc}/home
 ssl = $${:etc}/ssl
 
 
-[runTest-instance]
-recipe = slapos.recipe.template
-url = ${template-test:output}
-output = $${directory:bin}/test.py
-buildout-directory = $${buildout:directory}
-mode = 0700
-
 #################################
 # fluentd service
 #################################
@@ -101,15 +92,3 @@ repository = ${slapos-repository:location}
 [create-directory]
 recipe = slapos.cookbook:mkdirectory
 bin = $${buildout:directory}/bin
-
-[slapos-test-runner]
-recipe = slapos.cookbook:wrapper
-wrapper-path = $${directory:bin}/runTestSuite
-command-line =
-  ${buildout:bin-directory}/runTestSuite
-  --python_interpreter=${buildout:bin-directory}/${eggs:interpreter}
-  --source_code_path_list=$${slapos:location}/software/erp5testnode/testsuite/fluentTest/tests/
-environment =
-  PATH=${buildout:bin-directory}:/usr/bin/:/bin/
-  LOCAL_IPV4=$${slap-network-information:local-ipv4}
-  GLOBAL_IPV6=$${slap-network-information:global-ipv6}
\ No newline at end of file

software/erp5testnode/testsuite/fluentTest/instance.cfg.in

@@ -16,10 +16,10 @@ eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = $${:caddy}
-caddy = $${dynamic-template-caddy-fluentd:rendered}
+#[switch-softwaretype]
+#recipe = slapos.cookbook:softwaretype
+#default = $${:caddy}
+#caddy = $${dynamic-template-caddy-fluentd:rendered}
 
 [dynamic-template-caddy-fluentd]
 recipe = slapos.recipe.template:jinja2

software/erp5testnode/testsuite/fluentTest/software.cfg

@@ -2,61 +2,19 @@
 
 extends =
   ../../../../stack/slapos.cfg
-  ../../../../software/caddy/software.cfg
+  ../../../../software/caddy-frontend/software.cfg
   ../../../../software/fluentd/software.cfg
 
 index = https://pypi.python.org/simple/
 
 parts =
   slapos-cookbook
-  eggs
-  caddy
+  instance-profile
   fluentd
   fluentd-plugin-dev-repository
-  instance-profile
   template-fluentdConfig
 
 
-
-[setup-develop-egg]
-recipe = zc.recipe.egg:develop
-
-[slapos.test.fluentTest-setup]
-<= setup-develop-egg
-egg = slapos.test.fluentTest
-setup = ${slapos-repository:location}/software/erp5testnode/testsuite/fluentTest/tests/
-#setup = ${:_profile_base_location_}/tests/
-
-[erp5.util-setup]
-<= setup-develop-egg
-egg = erp5.util[testnode]
-setup = ${erp5.util-repository:location}
-
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  ${slapos.test.fluentTest-setup:egg}
-  ${erp5.util-setup:egg}
-  slapos.core
-entry-points =
-  runTestSuite=erp5.util.testsuite:runTestSuite
-scripts =
-  runTestSuite
-  slapos
-interpreter=
-  python_for_test
-
-[git-clone-repository]
-recipe = slapos.recipe.build:gitclone
-git-executable = ${git:location}/bin/git
-forbid-download-cache = true
-branch = testForFleuntdClean
-
-[slapos-repository]
-<= git-clone-repository
-repository = https://lab.nexedi.com/Sokhoyan/slapos.git
-
 # XXX we need an unreleased ( 0.4.51 ) version of erp5.util runTestSuite 
 # later we can stop fetching it from git and just use egg
 [erp5.util-repository]
@@ -64,30 +22,14 @@ repository = https://lab.nexedi.com/Sokhoyan/slapos.git
 repository = https://lab.nexedi.com/nexedi/erp5.git
 revision = 69013fa0fb67501089c776ab5e75d7bbf2e0e3bc
 
-[versions]
-# clear the version of tested eggs, to make sure we installed the developped ones
-slapos.test.fluentTest =
-erp5.util =
-#erp5.util = 0.4.51
-
-
-
-
-#[eggs]
-#recipe = zc.recipe.egg
-#eggs =
-#  erp5.util
-#  ${lxml-python:egg}
-#  requests
-#interpreter = pythonwitheggs
-
 [instance-profile]
 recipe = slapos.recipe.template
-md5sum = 45c4adaae557bed5c25c24f4c4506b3d
+md5sum = 6db1e18773f14811295f7902ae06c85a
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
 mode = 0644
 
+
 [template-test]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/tests/test.py
@@ -134,22 +76,6 @@ mode = 0644
 [template-caddy-fluentd]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-caddy-fluentd.cfg.in
-md5sum = ee285ee5d2df708776d2b97a09499ef5
+md5sum = bcafba1b45e49bd54205ee256336e160
 output = ${buildout:directory}/instance-caddy-fluentd.cfg.in
 mode = 0644
-
-[caddy]
-recipe  = slapos.recipe.cmmi
-path    = ${go_github.com_mholt_caddy:location}
-go      = ${gowork:golang}/bin/go
-configure-command = :
-make-targets =
-make-binary = cd ${:path}/caddy  && ${:go} install -v
-environment =
-  PATH=${pkgconfig:location}/bin:${gowork:golang}/bin:${buildout:bin-directory}:%(PATH)s
-  GOPATH=${gowork:directory}
-output =  ${gowork:bin}/caddy
-
-#versions]
-#slapos.recipe.template = 4.3
-#erp5.util = 0.4.50
\ No newline at end of file