From 33b136fff3631e926c94d7bac5fe4a6a3544f0dc Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Thu, 21 Apr 2016 19:36:00 -0700 Subject: [PATCH] Fix for 'branch' overrides to work teuthology default override template defines devcommit which makes 'branch' overrides in the test useless since it only picksup one option Remove the devcommit overrides from the template and use that as default in case no other 'branch' override exist. Signed-off-by: Vasu Kulkarni --- tasks/ceph_deploy.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tasks/ceph_deploy.py b/tasks/ceph_deploy.py index 8c4ef015680b6..5919e6f4176ea 100644 --- a/tasks/ceph_deploy.py +++ b/tasks/ceph_deploy.py @@ -239,14 +239,19 @@ def build_ceph_cluster(ctx, config): ceph_admin, conf_path, lines, sudo=True) # install ceph - install_nodes = './ceph-deploy install ' + \ - (ceph_branch if ceph_branch else "--dev=master") + " " + all_nodes + ceph_sha = ctx.config['sha1'] + devcommit = '--dev-commit={sha}'.format(sha=ceph_sha) + if ceph_branch: + option = ceph_branch + else: + option = devcommit + install_nodes = './ceph-deploy install ' + option + " " + all_nodes estatus_install = execute_ceph_deploy(install_nodes) if estatus_install != 0: raise RuntimeError("ceph-deploy: Failed to install ceph") # install ceph-test package too - install_nodes2 = './ceph-deploy install --tests ' + \ - (ceph_branch if ceph_branch else "--dev=master") + " " + all_nodes + install_nodes2 = './ceph-deploy install --tests ' + option + \ + " " + all_nodes estatus_install = execute_ceph_deploy(install_nodes2) if estatus_install != 0: raise RuntimeError("ceph-deploy: Failed to install ceph-test") -- 2.39.5