qa/tests: when no branch is specified, use wip branch under test for upgrade

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

diff --git a/qa/tasks/ceph_deploy.py b/qa/tasks/ceph_deploy.py
index 2e494f1707a1973a7af783400fc4c89c085a0942..e51bc89ad35eb1e73cc40043fd07d23da15f856c 100644 (file)
--- a/qa/tasks/ceph_deploy.py
+++ b/qa/tasks/ceph_deploy.py
@@ -792,8 +792,9 @@ def upgrade(ctx, config):
         (var, val) = branch.items()[0]
         ceph_branch = '--{var}={val}'.format(var=var, val=val)
     else:
-        # default to master
-        ceph_branch = '--dev=master'
+        # default to wip-branch under test
+        dev_branch = ctx.config['branch']
+        ceph_branch = '--dev={branch}'.format(branch=dev_branch)
     # get the node used for initial deployment which is mon.a
     mon_a = mapped_role.get('mon.a')
     (ceph_admin,) = ctx.cluster.only(mon_a).remotes.iterkeys()