Don't hardcode the git://ceph.com/git/ mirror

Default to https://github.com/ceph/ but add a ~/teuthology.yaml option

diff --git a/teuthology/task/ceph-deploy.py b/teuthology/task/ceph-deploy.py
index 193e6583ecab0a56a3a71f5bdc958c9177b64b61..ee95ccb400ed816b82ea29346ae7d885c6cbad14 100644 (file)
--- a/teuthology/task/ceph-deploy.py
+++ b/teuthology/task/ceph-deploy.py
@@ -31,7 +31,7 @@ def download_ceph_deploy(ctx, config):
     ctx.cluster.only(ceph_admin).run(
         args=[
             'git', 'clone', '-b', ceph_deploy_branch,
-            'git://ceph.com/ceph-deploy.git',
+            config.ceph_git_base_url + 'ceph-deploy.git',
             '{tdir}/ceph-deploy'.format(tdir=testdir),
             ],
         )

diff --git a/teuthology/task/s3readwrite.py b/teuthology/task/s3readwrite.py
index 6583caafffd587b3e274e54c61f02e46673b8ae4..99795838d5993848581b35103504ffbff654e0ae 100644 (file)
--- a/teuthology/task/s3readwrite.py
+++ b/teuthology/task/s3readwrite.py
@@ -29,8 +29,7 @@ def download(ctx, config):
             args=[
                 'git', 'clone',
                 '-b', branch,
-#                'https://github.com/ceph/s3-tests.git',
-                'git://ceph.com/git/s3-tests.git',
+                config.ceph_git_base_url + 's3-tests.git',
                 '{tdir}/s3-tests'.format(tdir=testdir),
                 ],
             )
@@ -72,7 +71,7 @@ def create_users(ctx, config):
     users = {'s3': 'foo'}
     cached_client_user_names = dict()
     for client in config['clients']:
-        cached_client_user_names[client] = dict()  
+        cached_client_user_names[client] = dict()
         s3tests_conf = config['s3tests_conf'][client]
         s3tests_conf.setdefault('readwrite', {})
         s3tests_conf['readwrite'].setdefault('bucket', 'rwtest-' + client + '-{random}-')
@@ -86,13 +85,13 @@ def create_users(ctx, config):
         rwconf['files'].setdefault('stddev', 500)
         for section, user in users.iteritems():
             _config_user(s3tests_conf, section, '{user}.{client}'.format(user=user, client=client))
-            log.debug('creating user {user} on {client}'.format(user=s3tests_conf[section]['user_id'], 
+            log.debug('creating user {user} on {client}'.format(user=s3tests_conf[section]['user_id'],
                                                                 client=client))
 
-            # stash the 'delete_user' flag along with user name for easier cleanup 
+            # stash the 'delete_user' flag along with user name for easier cleanup
             delete_this_user = True
             if 'delete_user' in s3tests_conf['s3']:
-                delete_this_user = s3tests_conf['s3']['delete_user'] 
+                delete_this_user = s3tests_conf['s3']['delete_user']
                 log.debug('delete_user set to {flag} for {client}'.format(flag=delete_this_user,client=client))
             cached_client_user_names[client][section+user] = (s3tests_conf[section]['user_id'], delete_this_user)
 

diff --git a/teuthology/task/s3roundtrip.py b/teuthology/task/s3roundtrip.py
index c99aeacd7c80aa9a8f5d5e46a8395bc7cc1f320e..5b69119f74a2bb0c733cdba167ed95760a60898b 100644 (file)
--- a/teuthology/task/s3roundtrip.py
+++ b/teuthology/task/s3roundtrip.py
@@ -9,6 +9,7 @@ import yaml
 
 from teuthology import misc as teuthology
 from teuthology import contextutil
+from ..config import config as teuth_config
 from ..orchestra import run
 from ..orchestra.connection import split_user
 
@@ -24,8 +25,7 @@ def download(ctx, config):
         ctx.cluster.only(client).run(
             args=[
                 'git', 'clone',
-#                'https://github.com/ceph/s3-tests.git',
-                'git://ceph.com/git/s3-tests.git',
+                config.ceph_git_base_url + 's3-tests.git',
                 '{tdir}/s3-tests'.format(tdir=testdir),
                 ],
             )

diff --git a/teuthology/task/s3tests.py b/teuthology/task/s3tests.py
index 5109cf58e992dc4b0fe0164ac397c317e883facf..73907b850f7dc0c3ddb93ae891d8beeeb0b68c29 100644 (file)
--- a/teuthology/task/s3tests.py
+++ b/teuthology/task/s3tests.py
@@ -21,7 +21,7 @@ def extract_sync_client_data(ctx, client_name):
     return_dict = None
     client = ctx.ceph.conf.get(client_name, None)
     if client:
-        current_client_zone = client.get('rgw zone', None) 
+        current_client_zone = client.get('rgw zone', None)
         if current_client_zone:
             (endpoint_host, endpoint_port) = ctx.rgw.role_endpoints.get(client_name,(None,None))
             # pull out the radosgw_agent stuff
@@ -40,7 +40,7 @@ def extract_sync_client_data(ctx, client_name):
                         return_dict['port'] = endpoint_port
                         return_dict['host'] = endpoint_host
 
-                        # The s3tests expect the sync_agent_[addr|port} to be 
+                        # The s3tests expect the sync_agent_[addr|port} to be
                         # set on the non-master node for some reason
                         if not region_data['is master']:
                           (rgwagent_host,rgwagent_port) = ctx.radosgw_agent.endpoint
@@ -59,9 +59,9 @@ def update_conf_with_region_info(ctx, config, s3tests_conf):
         # we'll assume that there's only one sync relationship (source / destination) with client.X
         # as the key for now
 
-        # Iterate through all of the radosgw_agent (rgwa) configs and see if a 
-        # given client is involved in a relationship. 
-        # If a given client isn't, skip it 
+        # Iterate through all of the radosgw_agent (rgwa) configs and see if a
+        # given client is involved in a relationship.
+        # If a given client isn't, skip it
         this_client_in_rgwa_config = False
         for rgwa in ctx.radosgw_agent.config.keys():
             rgwa_data = ctx.radosgw_agent.config[rgwa]
@@ -111,8 +111,7 @@ def download(ctx, config):
             args=[
                 'git', 'clone',
                 '-b', branch,
-#                'https://github.com/ceph/s3-tests.git',
-                'git://ceph.com/git/s3-tests.git',
+                config.ceph_git_base_url + 's3-tests.git',
                 '{tdir}/s3-tests'.format(tdir=testdir),
                 ],
             )

diff --git a/teuthology/task/swift.py b/teuthology/task/swift.py
index 90c5901d7295c7136b9def7534d52e890622b508..38da17c33968bc5c850a237f4415486370702d92 100644 (file)
--- a/teuthology/task/swift.py
+++ b/teuthology/task/swift.py
@@ -22,7 +22,7 @@ def download(ctx, config):
         ctx.cluster.only(client).run(
             args=[
                 'git', 'clone',
-                'git://ceph.com/git/swift.git',
+                config.ceph_git_base_url + 'swift.git',
                 '{tdir}/swift'.format(tdir=testdir),
                 ],
             )