From: Vasu Kulkarni <vasu@redhat.com>
Date: Tue, 28 Jul 2015 17:38:47 +0000 (-0400)
Subject:  - Use branch from config for ceph-deploy testing instead of released branch
X-Git-Tag: v10.2.6~165^2^2~413^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1116a0af8246f9934b32e5d31f006d70b4e1f8a;p=ceph.git

 - Use branch from config for ceph-deploy testing instead of released branch

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
---

diff --git a/tasks/ceph_deploy.py b/tasks/ceph_deploy.py
index 330e5f0ed13..6fd302751bc 100644
--- a/tasks/ceph_deploy.py
+++ b/tasks/ceph_deploy.py
@@ -475,10 +475,16 @@ def cli_test(ctx, config):
     if config is None:
         config = {}
         
+    test_branch=''
     if config.get('rhbuild'):
         path=None
     else:
-        path = teuthology.get_testdir(ctx)  
+        path = teuthology.get_testdir(ctx)
+        # test on branch from config eg: wip-* , master or next etc
+        # packages for all distro's should exist for wip*
+        if ctx.config.get('branch'):
+            branch=ctx.config.get('branch')
+            test_branch=' --dev={branch} '.format(branch=branch)
     mons = ctx.cluster.only(teuthology.is_type('mon'))
     for node,role in mons.remotes.iteritems():
         admin=node
@@ -498,9 +504,9 @@ def cli_test(ctx, config):
             raise RuntimeError ( "Needs minimum of 3 devices ")
     
     new_cmd= 'new ' + nodename
-    new_mon_install = 'install --mon ' + nodename
-    new_osd_install = 'install --osd ' + nodename
-    new_admin = 'install --cli ' + nodename
+    new_mon_install = 'install {branch} --mon '.format(branch=test_branch) + nodename
+    new_osd_install = 'install {branch} --osd '.format(branch=test_branch) + nodename
+    new_admin = 'install {branch} --cli '.format(branch=test_branch) + nodename
     create_initial= '--overwrite-conf mon create-initial '
     execute_cdeploy(admin,new_cmd,path)
     execute_cdeploy(admin,new_mon_install,path)