From 1e52fb9b81f5d5c7844e8e9dca6a620d6b163208 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 28 Apr 2013 09:35:45 -0700 Subject: [PATCH] install: prefer 'branch' over 'sha1' The upgrade tasks specify 'branch' in the job file, but the schedule_suite.sh script sets a sha1 in the overrides. Make the upgrade tests actually test an upgrade by preferring branch over sha1 when both are specified. This is fragile, but ought to do the trick for now! Signed-off-by: Sage Weil --- teuthology/task/install.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/teuthology/task/install.py b/teuthology/task/install.py index 4255bb09ca..8fd7195779 100644 --- a/teuthology/task/install.py +++ b/teuthology/task/install.py @@ -50,12 +50,12 @@ def _get_baseurlinfo_and_dist(ctx, remote, config): uri = None log.info('config is %s', config) - if config.get('sha1') is not None: - uri = 'sha1/' + config.get('sha1') - elif config.get('tag') is not None: + if config.get('tag') is not None: uri = 'ref/' + config.get('tag') elif config.get('branch') is not None: uri = 'ref/' + config.get('branch') + elif config.get('sha1') is not None: + uri = 'sha1/' + config.get('sha1') else: uri = 'ref/master' retval['uri'] = uri -- 2.39.5