Reorganise more python2 / python3 test suites

See merge request nexedi/slapos!1249

component/zodbtools/test-py2.cfg

+[python]
+part = python2.7

component/zodbtools/test-zodb4-py2.cfg

+# SlapOS software release to test zodbtools/ZODB4-py2 on Nexedi testing infrastructure.
+
+[buildout]
+extends =
+  test-zodb4.cfg
+  test-py2.cfg

component/zodbtools/test-zodb4-wc2-py2.cfg

+# SlapOS software release to test zodbtools/ZODB4-wc2-py2 on Nexedi testing infrastructure.
+
+[buildout]
+extends =
+  test-zodb4-wc2.cfg
+  test-py2.cfg

component/zodbtools/test-zodb4-wc2.cfg

-# SlapOS software release to test zodbtools/ZODB4-wc2 on Nexedi testing infrastructure.
+# SlapOS software release to test zodbtools/ZODB4-wc2-py3 on Nexedi testing infrastructure.
 
 [buildout]
 extends = test-common.cfg

component/zodbtools/test-zodb4.cfg

+# SlapOS software release to test zodbtools/ZODB4-py3 on Nexedi testing infrastructure.
+
+[buildout]
+extends = test-common.cfg
+
+[ZODB]
+major = 4

component/zodbtools/test-zodb5-py2.cfg

+# SlapOS software release to test zodbtools/ZODB5-py2 on Nexedi testing infrastructure.
+
+[buildout]
+extends =
+  test-zodb5.cfg
+  test-py2.cfg

component/zodbtools/test-zodb5.cfg

-# SlapOS software release to test zodbtools/ZODB5 on Nexedi testing infrastructure.
+# SlapOS software release to test zodbtools/ZODB5-py3 on Nexedi testing infrastructure.
 
 [buildout]
 extends = test-common.cfg

component/zodbtools/test.cfg

-# SlapOS software release to test zodbtools on Nexedi testing infrastructure.
-
-[buildout]
-extends = test-common.cfg

software/buildout-testing/software-py3.cfg → software/buildout-testing/software-py2.cfg

@@ -3,4 +3,4 @@ extends =
   software.cfg
 
 [python]
-part = python3
+part = python2.7

software/buildout-testing/software.cfg

@@ -6,9 +6,6 @@ parts =
   slapos-cookbook
   template
 
-[python]
-part = python2.7
-
 [slapos.buildout-repository]
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/slapos.buildout.git

software/slapos-testing/README.md

@@ -36,14 +36,14 @@ source ( environment script from step above )
 cd ~/srv/runner/instance/slappartXXX/parts/slapos.core/
 
 # make some changes to the code
-vim slapos/tests/client.py
+$EDITOR slapos/tests/client.py
 
 # run slapos.core tests
 runTestSuite --run slapos.core
 # ... or run all eggs tests
 runTestSuite
 
-# when satified, commit changes
+# when satisfied, commit changes
 git add -p && git commit
 
 # add developer's fork remote (this is only needed the first time)

software/slapos-testing/software-py3.cfg → software/slapos-testing/software-py2.cfg

@@ -3,4 +3,4 @@ extends =
   software.cfg
 
 [python]
-part = python3
+part = python2.7

software/slapos-testing/software.cfg

@@ -30,9 +30,6 @@ parts =
   phantomjs
   template
 
-[python]
-part = python2.7
-
 [bootstrap-slapos.recipe.cmmi]
 # install our develop version of slapos.recipe.cmmi before anything else,
 # otherwise it will be installed from pypi by dependencies.