From: Vasu Kulkarni <vasu@redhat.com>
Date: Fri, 8 Dec 2017 01:47:01 +0000 (-0800)
Subject: qa/tests: when no branch is specified, use wip branch under test for upgrade
X-Git-Tag: v13.0.2~806^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7883c1fb250e86fae67971e1d1af92b6b16fe5b;p=ceph-ci.git

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 2e494f1707a..e51bc89ad35 100644
--- 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()