From: Vasu Kulkarni <vasu@redhat.com>
Date: Thu, 3 Sep 2015 16:10:39 +0000 (-0400)
Subject: Don't consume config['rhbuild'] until overrides are merged
X-Git-Tag: 1.1.0~828^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dbdb4542253fe5e8e88f159cb461dd9ad8eee12f;p=teuthology.git

Don't consume config['rhbuild'] until overrides are merged

rhbuild from config was read before overrides was merged

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

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index 76a6493d3..2a0affe53 100644
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -1162,11 +1162,6 @@ def task(ctx, config):
     assert isinstance(config, dict), \
         "task install only supports a dictionary for configuration"
 
-    rhbuild = None
-    if config.get('rhbuild'):
-        rhbuild = config.get('rhbuild')
-        log.info("Build is %s " % rhbuild)
-
     project, = config.get('project', 'ceph'),
     log.debug('project %s' % project)
     overrides = ctx.config.get('overrides')
@@ -1175,6 +1170,11 @@ def task(ctx, config):
         teuthology.deep_merge(config, install_overrides.get(project, {}))
     log.debug('config %s' % config)
 
+    rhbuild = None
+    if config.get('rhbuild'):
+        rhbuild = config.get('rhbuild')
+        log.info("Build is %s " % rhbuild)
+
     flavor = get_flavor(config)
     log.info("Using flavor: %s", flavor)