runner: Support suffix for slapos-st-testing environments

software/slaprunner/buildout.hash.cfg

@@ -22,7 +22,7 @@ md5sum = 73f8d2e4dda8f46b83cb45cacd7434f7
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
-md5sum = 2852689640b632fc713d7a603ce66207
+md5sum = f2e2493bc5da90a53f86e5bcf64d2d57
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in

software/slaprunner/template/runner-import.sh.jinja2

@@ -173,7 +173,7 @@ if 1:
 
   # We want to replace the last occurence only
   old_software_release, partition = sys.argv[1], sys.argv[2]
-  for match in re.finditer("(slappart|test0-)[0-9][0-9]*", old_software_release):
+  for match in re.finditer("(slappart|test0-|s)[0-9][0-9]*", old_software_release):
     start, end = match.start(), match.end()
 
   print old_software_release[:start] + partition + old_software_release[end:]