From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 3 Sep 2019 19:25:05 +0000 (-0400)
Subject: qa: barbican task doesn't look for ceph release branches
X-Git-Tag: v15.1.0~1525^2~10
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c9c3805cd1b0c348b88341f366605df0d4e4f6ca;p=ceph-ci.git

qa: barbican task doesn't look for ceph release branches

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/tasks/barbican.py b/qa/tasks/barbican.py
index 8aeebfe3fa4..360b11cfb7e 100644
--- a/qa/tasks/barbican.py
+++ b/qa/tasks/barbican.py
@@ -30,21 +30,9 @@ def download(ctx, config):
     assert isinstance(config, dict)
     log.info('Downloading barbican...')
     testdir = teuthology.get_testdir(ctx)
-    s3_branches = ['giant', 'firefly', 'firefly-original', 'hammer']
     for (client, cconf) in config.items():
-        branch = cconf.get('force-branch', None)
-        if not branch:
-            ceph_branch = ctx.config.get('branch')
-            suite_branch = ctx.config.get('suite_branch', ceph_branch)
-            if suite_branch in s3_branches:
-                branch = cconf.get('branch', suite_branch)
-            else:
-                branch = cconf.get('branch', 'ceph-' + suite_branch)
-        if not branch:
-            raise ValueError(
-                "Could not determine what branch to use for barbican!")
-        else:
-            log.info("Using branch '%s' for barbican", branch)
+        branch = cconf.get('force-branch', 'master')
+        log.info("Using branch '%s' for barbican", branch)
 
         sha1 = cconf.get('sha1')
         log.info('sha1=%s', sha1)