From c1116a0af8246f9934b32e5d31f006d70b4e1f8a Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Tue, 28 Jul 2015 13:38:47 -0400 Subject: [PATCH] - Use branch from config for ceph-deploy testing instead of released branch Signed-off-by: Vasu Kulkarni --- tasks/ceph_deploy.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tasks/ceph_deploy.py b/tasks/ceph_deploy.py index 330e5f0ed13a6..6fd302751bcc9 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) -- 2.39.5