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

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

diff --git a/s3tests.py b/s3tests.py
index 5109cf58e992dc4b0fe0164ac397c317e883facf..73907b850f7dc0c3ddb93ae891d8beeeb0b68c29 100644 (file)
--- a/s3tests.py
+++ b/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/swift.py b/swift.py
index 90c5901d7295c7136b9def7534d52e890622b508..38da17c33968bc5c850a237f4415486370702d92 100644 (file)
--- a/swift.py
+++ b/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),
                 ],
             )