Remove setting of unused 's3_branch' value

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 779db17b63030404db82726c7e10e0edbd09c026..79bb275a3560ca72075d982e09e757936ea1a447 100644 (file)
--- a/teuthology/suite.py
+++ b/teuthology/suite.py
@@ -185,15 +185,6 @@ def create_initial_config(suite, suite_branch, ceph_branch, teuthology_branch,
             ver=ceph_version))
     log.info("ceph version: {ver}".format(ver=ceph_version))
 
-    # Decide what branch of s3-tests to use
-    if get_branch_info('s3-tests', ceph_branch):
-        s3_branch = ceph_branch
-    else:
-        log.info("branch {0} not in s3-tests.git; will use master for"
-                 " s3-tests".format(ceph_branch))
-        s3_branch = 'master'
-    log.info("s3-tests branch: %s", s3_branch)
-
     if teuthology_branch:
         if not get_branch_info('teuthology', teuthology_branch):
             exc = BranchNotFoundError(teuthology_branch, 'teuthology.git')
@@ -226,7 +217,6 @@ def create_initial_config(suite, suite_branch, ceph_branch, teuthology_branch,
         teuthology_branch=teuthology_branch,
         machine_type=machine_type,
         distro=distro,
-        s3_branch=s3_branch,
     )
     conf_dict = substitute_placeholders(dict_templ, config_input)
     conf_dict.update(kernel_dict)
@@ -701,9 +691,6 @@ dict_templ = {
                 'sha1': Placeholder('ceph_hash'),
             }
         },
-        's3tests': {
-            'branch': Placeholder('s3_branch'),
-        },
         'workunit': {
             'sha1': Placeholder('ceph_hash'),
         }

diff --git a/teuthology/test/test_suite.py b/teuthology/test/test_suite.py
index 27558b6dbc892200c2b5b3024a37d9b8c4786d74..f30f1eea867173e11e60acab1e166b2269098be5 100644 (file)
--- a/teuthology/test/test_suite.py
+++ b/teuthology/test/test_suite.py
@@ -48,7 +48,6 @@ class TestSuiteOffline(object):
             teuthology_branch='teuthology_branch',
             machine_type='machine_type',
             distro='distro',
-            s3_branch='s3_branch',
         )
         output_dict = suite.substitute_placeholders(suite.dict_templ,
                                                     input_dict)