Fixes #10869, added {role} to the dir name.

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
Fixed typo

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>
(cherry picked from commit 9942440ddf9f6847e76de3b49f1ad0d98c62a3d0)
(cherry picked from commit fea2e227746b02519b4ebdee10aeb705027e70b6)

diff --git a/tasks/workunit.py b/tasks/workunit.py
index 6871802ac6539db2ab458a30b83c29babadd7ead..548fc5898b8118b3b8940d5989bb63f0a76a0e63 100644 (file)
--- a/tasks/workunit.py
+++ b/tasks/workunit.py
@@ -308,13 +308,13 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None, timeout=None):
             'if', 'test', '-e', 'Makefile', run.Raw(';'), 'then', 'make', run.Raw(';'), 'fi',
             run.Raw('&&'),
             'find', '-executable', '-type', 'f', '-printf', r'%P\0'.format(srcdir=srcdir),
-            run.Raw('>{tdir}/workunits.list'.format(tdir=testdir)),
+            run.Raw('>{tdir}/workunits.list.{role}'.format(tdir=testdir, role=role)),
         ],
     )
 
     workunits = sorted(misc.get_file(
         remote,
-        '{tdir}/workunits.list'.format(tdir=testdir)).split('\0'))
+        '{tdir}/workunits.list.{role}'.format(tdir=testdir, role=role)).split('\0'))
     assert workunits
 
     try:
@@ -369,6 +369,6 @@ def _run_tests(ctx, refspec, role, tests, env, subdir=None, timeout=None):
         remote.run(
             logger=log.getChild(role),
             args=[
-                'rm', '-rf', '--', '{tdir}/workunits.list'.format(tdir=testdir), srcdir,
+                'rm', '-rf', '--', '{tdir}/workunits.list.{role}'.format(tdir=testdir, role=role), srcdir,
             ],
         )