From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 21 Feb 2017 22:56:06 +0000 (-0800)
Subject: qa/tasks/ragweed: configurable stages
X-Git-Tag: v13.0.2~206^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=831645c3cff331d9caf716a60eab610ebe936e4b;p=ceph.git

qa/tasks/ragweed: configurable stages

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/qa/tasks/ragweed.py b/qa/tasks/ragweed.py
index 7106c1a85867..ffd52859a9f7 100644
--- a/qa/tasks/ragweed.py
+++ b/qa/tasks/ragweed.py
@@ -232,9 +232,12 @@ def run_tests(ctx, config):
     if not ctx.rgw.use_fastcgi:
         attrs.append("!fails_on_mod_proxy_fcgi")
     for client, client_config in config.iteritems():
+        stages = 'prepare,check'
+        if client_config is not None:
+            stages = client_config.get('stages', 'prepare,check')
         args = [
             'RAGWEED_CONF={tdir}/archive/ragweed.{client}.conf'.format(tdir=testdir, client=client),
-            'RAGWEED_RUN=stage,check',
+            'RAGWEED_STAGES={stages}'.format(stages=stages),
             'BOTO_CONFIG={tdir}/boto.cfg'.format(tdir=testdir),
             '{tdir}/ragweed/virtualenv/bin/nosetests'.format(tdir=testdir),
             '-w',
@@ -279,6 +282,7 @@ def task(ctx, config):
             client.0:
               rgw_server: client.1
               idle_timeout: 600
+              stages: prepare,check
 
     To pass extra arguments to nose (e.g. to run a certain test)::