erp5testnode: Shorten instance partition paths

`srv/testnode/abc/inst/test0-0`  -> `t/abc/i/0`

software/erp5testnode/buildout.hash.cfg

@@ -18,4 +18,4 @@ md5sum = d9c7c3acb975d44c6c66ca32c550ac58
 
 [template-default]
 filename = instance-default.cfg.jinja.in
-md5sum = f1b25694db5d446c3df03a85478ccdfb
+md5sum = 02d615920ab8630e6703e6e949866763

software/erp5testnode/instance-default.cfg.jinja.in

@@ -20,6 +20,7 @@ parts =
   resiliency-exclude-file
   shellinabox-frontend-reload
   promises
+  testnode-compatibility
 
 [monitor-publish]
 recipe = slapos.cookbook:publish
@@ -206,7 +207,7 @@ run = $${rootdirectory:var}/run
 [directory]
 recipe = slapos.cookbook:mkdirectory
 slapos = $${rootdirectory:srv}/slapos
-testnode = $${rootdirectory:srv}/testnode
+testnode = $${buildout:directory}/t
 shared = $${rootdirectory:srv}/shared
 test-suite = $${rootdirectory:srv}/test_suite
 log = $${basedirectory:log}/testnode
@@ -215,6 +216,16 @@ software = $${rootdirectory:srv}/software
 shellinabox = $${rootdirectory:srv}/shellinabox
 ca-dir = $${rootdirectory:srv}/ca
 
+[testnode-compatibility]
+# Remove old ~/srv/testnode
+recipe = slapos.recipe.build
+update =
+  import os
+  from zc.buildout.rmtree import rmtree
+  old_testnode_path = self.buildout['rootdirectory']['srv'] + '/testnode'
+  if os.path.exists(old_testnode_path):
+    rmtree(old_testnode_path)
+
 [resiliency-exclude-file]
 # Generate rdiff exclude file in case of resiliency
 recipe = collective.recipe.template

stack/slapos.cfg

@@ -224,7 +224,7 @@ atomize = 0.2.0
 croniter = 0.3.25
 dnspython = 1.16.0
 enum34 = 1.1.10
-erp5.util = 0.4.69
+erp5.util = 0.4.70
 feedparser = 5.2.1
 functools32 = 3.2.3.post2
 attrs = 18.2.0