From: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Date: Thu, 16 Jun 2011 22:38:25 +0000 (-0700)
Subject: Support running multiple autotest tests.
X-Git-Tag: v0.94.10~27^2^2~364^2~1710
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b237fc50eb8fbfbeb448d3f1eaa07dcbd6d354c;p=ceph.git

Support running multiple autotest tests.

Docs had this from the start, it was just buggy. Still
doesn't support using the "autotest" task more than once,
no easy way to differentiate the results in that case.
---

diff --git a/teuthology/task/autotest.py b/teuthology/task/autotest.py
index f91f7c9b779a..4be6e76186bd 100644
--- a/teuthology/task/autotest.py
+++ b/teuthology/task/autotest.py
@@ -32,6 +32,10 @@ def task(ctx, config):
         # TODO parallelize
         ctx.cluster.only(role).run(
             args=[
+                # explicitly does not support multiple autotest tasks
+                # in a single run; the result archival would conflict
+                'mkdir', '/tmp/cephtest/archive/autotest',
+                run.Raw('&&'),
                 'mkdir', '/tmp/cephtest/autotest',
                 run.Raw('&&'),
                 'wget',
@@ -81,10 +85,11 @@ def task(ctx, config):
         scratch = os.path.join(mnt, 'client.{id}'.format(id=id_))
 
         assert isinstance(tests, list)
-        for testname in tests:
-            log.info('Running autotest client test %s...', testname)
+        for idx, testname in enumerate(tests):
+            log.info('Running autotest client test #%d: %s...', idx, testname)
 
-            tag = '{testname}.client.{id}'.format(
+            tag = 'client.{id}.num{idx}.{testname}'.format(
+                idx=idx,
                 testname=testname,
                 id=id_,
                 )
@@ -117,6 +122,11 @@ def task(ctx, config):
 
             remote.run(
                 args=[
-                    'rm', '-rf', '--', control, '/tmp/cephtest/autotest',
+                    'rm', '-rf', '--', control,
                     ],
                 )
+        remote.run(
+            args=[
+                'rm', '-rf', '--', '/tmp/cephtest/autotest',
+                ],
+            )