DONOTMERGE: changes for running tests on correct branches + debug

software/slapos-sr-testing/software.cfg

@@ -159,6 +159,7 @@ recipe = zc.recipe.egg
 eggs =
   ${pycurl:egg}
   ${lxml-python:egg}
+  ${slapos.toolbox:egg}
   ${slapos.core-setup:egg}
   ${pillow-python:egg}
   erp5.util
@@ -207,7 +208,7 @@ forbid-download-cache = true
 [slapos-repository]
 <= git-clone-repository
 repository = https://lab.nexedi.com/nexedi/slapos.git
-branch = master
+branch = runner-multi-sr
 
 [template]
 recipe = slapos.recipe.template:jinja2
@@ -223,31 +224,7 @@ context =
   key curl_location curl:location
   key tests :tests
 tests =
-  ${slapos.test.kvm-setup:setup}
   ${slapos.test.slaprunner-setup:setup}
-  ${:extra}
-extra =
-  ${slapos.cookbook-setup:setup}
-  ${slapos.test.backupserver-setup:setup}
-  ${slapos.test.caddy-frontend-setup:setup}
-  ${slapos.test.erp5-setup:setup}
-  ${slapos.test.htmlvalidatorserver-setup:setup}
-  ${slapos.test.slapos-master-setup:setup}
-  ${slapos.test.plantuml-setup:setup}
-  ${slapos.test.powerdns-setup:setup}
-  ${slapos.test.proftpd-setup:setup}
-  ${slapos.test.re6stnet-setup:setup}
-  ${slapos.test.seleniumserver-setup:setup}
-  ${slapos.test.helloworld-setup:setup}
-  ${slapos.test.jstestnode-setup:setup}
-  ${slapos.test.jupyter-setup:setup}
-  ${slapos.test.nextcloud-setup:setup}
-  ${slapos.test.turnserver-setup:setup}
-  ${slapos.test.theia-setup:setup}
-  ${slapos.test.grafana-setup:setup}
-  ${slapos.test.gitlab-setup:setup}
-  ${slapos.test.cloudooo-setup:setup}
-  ${slapos.test.dream-setup:setup}
 
 [versions]
 # slapos.core is used from the clone always

software/slaprunner/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = ec70348dd71b319590a5c5837f3d2e45
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = f342daca2e87f8fa44fd7b6a2a1c22f8
+md5sum = e7d59488e5f67011985211d775a9c499
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/instance-runner.cfg

@@ -640,7 +640,7 @@ frontend-domain =
 slapos-repository = https://lab.nexedi.com/nexedi/slapos.git
 slapos-software =
 slapos-software-type =
-slapos-reference = 1.0
+slapos-reference = runner-multi-sr
 auto-deploy = false
 auto-deploy-instance = true
 autorun = false

stack/slapos.cfg

@@ -77,6 +77,19 @@ versions = versions
 # Define networkcache with shacache.org
 networkcache-section = networkcache
 
+[slapos.toolbox-repository]
+recipe = slapos.recipe.build:gitclone
+repository = https://lab.nexedi.com/Nicolas/slapos.toolbox.git
+revision =
+branch = runner-multi-sr
+git-executable = ${git:location}/bin/git
+develop = true
+
+[slapos.toolbox]
+recipe = zc.recipe.egg:develop
+egg = slapos.toolbox
+setup = ${slapos.toolbox-repository:location}
+
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/slapos.git
@@ -107,7 +120,7 @@ eggs =
   ${lxml-python:egg}
   ${pycurl:egg}
   ${python-cryptography:egg}
-  slapos.toolbox
+  ${slapos.toolbox:egg}
 
 # Install a slapos command with networkcache enabled in ${buildout:bin-directory}
 [slapos-command]
@@ -163,7 +176,7 @@ slapos.libnetworkcache = 0.20
 slapos.rebootstrap = 4.4
 slapos.recipe.build = 0.44
 slapos.recipe.cmmi = 0.13
-slapos.toolbox = 0.109
+slapos.toolbox =
 stevedore = 1.21.0
 subprocess32 = 3.5.3
 unicodecsv = 0.14.1