x/stackalytics
Code Issues Proposed changes

Remove use of github urls

Browse Source 
github fails all the time and really shouldn't be used for any automated
systems, but certainly not anything that's going to run in infra.

Replace the github urls with urls pointing to the OpenStack cgit
mirrors.

Change-Id: I2bdada775f71cbb7c484979d206679276e517088
This commit is contained in:
Monty Taylor 2014-06-08 11:33:23 -07:00
parent a07c179351
commit ae316668f2
13 changed files with 103 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -16,7 +16,7 @@ Project Info
-------------
* Web-site: http://stackalytics.com/
* Source Code: http://github.com/stackforge/stackalytics
* Source Code: http://git.openstack.org/cgit/stackforge/stackalytics
* Wiki: https://wiki.openstack.org/wiki/Stackalytics
* Launchpad: https://launchpad.net/stackalytics
* Blueprints: https://blueprints.launchpad.net/stackalytics

66
etc/default_data.json
View File

@ -6866,7 +6866,7 @@
"tag_from": "2014.1"
}
],
"uri": "git://github.com/openstack/nova.git",
"uri": "git://git.openstack.org/openstack/nova.git",
"module": "nova",
"organization": "openstack"
},
@ -6905,7 +6905,7 @@
"tag_from": "2014.1"
}
],
"uri": "git://github.com/openstack/keystone.git",
"uri": "git://git.openstack.org/openstack/keystone.git",
"module": "keystone",
"organization": "openstack"
},
@ -6939,7 +6939,7 @@
"tag_from": "2014.1"
}
],
"uri": "git://github.com/openstack/cinder.git",
"uri": "git://git.openstack.org/openstack/cinder.git",
"module": "cinder",
"organization": "openstack"
},
@ -6978,7 +6978,7 @@
"tag_from": "2014.1"
}
],
"uri": "git://github.com/openstack/glance.git",
"uri": "git://git.openstack.org/openstack/glance.git",
"module": "glance",
"organization": "openstack"
},
@ -7017,7 +7017,7 @@
"tag_from": "2014.1"
}
],
"uri": "git://github.com/openstack/neutron.git",
"uri": "git://git.openstack.org/openstack/neutron.git",
"module": "neutron",
"organization": "openstack"
},
@ -7056,7 +7056,7 @@
"tag_from": "2014.1"
}
],
"uri": "git://github.com/openstack/horizon.git",
"uri": "git://git.openstack.org/openstack/horizon.git",
"module": "horizon",
"organization": "openstack"
},
@ -7095,7 +7095,7 @@
"tag_from": "1.13.0"
}
],
"uri": "git://github.com/openstack/swift.git",
"uri": "git://git.openstack.org/openstack/swift.git",
"module": "swift",
"organization": "openstack"
},
@ -7127,7 +7127,7 @@
"tag_from": "0.8.0"
}
],
"uri": "git://github.com/openstack/python-keystoneclient.git",
"uri": "git://git.openstack.org/openstack/python-keystoneclient.git",
"module": "python-keystoneclient",
"organization": "openstack"
},
@ -7159,7 +7159,7 @@
"tag_from": "2.17.0"
}
],
"uri": "git://github.com/openstack/python-novaclient.git",
"uri": "git://git.openstack.org/openstack/python-novaclient.git",
"module": "python-novaclient",
"organization": "openstack"
},
@ -7186,7 +7186,7 @@
"tag_from": "1.0.8"
}
],
"uri": "git://github.com/openstack/python-cinderclient.git",
"uri": "git://git.openstack.org/openstack/python-cinderclient.git",
"module": "python-cinderclient",
"organization": "openstack"
},
@ -7208,7 +7208,7 @@
"tag_from": "0.11.0"
}
],
"uri": "git://github.com/openstack/python-glanceclient.git",
"uri": "git://git.openstack.org/openstack/python-glanceclient.git",
"module": "python-glanceclient",
"organization": "openstack"
},
@ -7235,7 +7235,7 @@
"tag_from": "2.3.1"
}
],
"uri": "git://github.com/openstack/python-neutronclient.git",
"uri": "git://git.openstack.org/openstack/python-neutronclient.git",
"module": "python-neutronclient",
"organization": "openstack"
},
@ -7257,7 +7257,7 @@
"tag_from": "1.8.0"
}
],
"uri": "git://github.com/openstack/python-swiftclient.git",
"uri": "git://git.openstack.org/openstack/python-swiftclient.git",
"module": "python-swiftclient",
"organization": "openstack"
},
@ -7286,7 +7286,7 @@
"tag_from": "2014.1"
}
],
"uri": "git://github.com/openstack/heat.git",
"uri": "git://git.openstack.org/openstack/heat.git",
"module": "heat",
"organization": "openstack"
},
@ -7308,7 +7308,7 @@
"tag_from": "0.2.5"
}
],
"uri": "git://github.com/openstack/python-heatclient.git",
"uri": "git://git.openstack.org/openstack/python-heatclient.git",
"module": "python-heatclient",
"organization": "openstack"
},
@ -7332,7 +7332,7 @@
"tag_from": "2014.1"
}
],
"uri": "git://github.com/openstack/ceilometer.git",
"uri": "git://git.openstack.org/openstack/ceilometer.git",
"module": "ceilometer",
"organization": "openstack"
},
@ -7349,7 +7349,7 @@
"tag_from": "1.0.6"
}
],
"uri": "git://github.com/openstack/python-ceilometerclient.git",
"uri": "git://git.openstack.org/openstack/python-ceilometerclient.git",
"module": "python-ceilometerclient",
"organization": "openstack"
},
@ -7373,7 +7373,7 @@
"tag_from": "2014.1"
}
],
"uri": "git://github.com/openstack/oslo-incubator.git",
"uri": "git://git.openstack.org/openstack/oslo-incubator.git",
"module": "oslo-incubator",
"organization": "openstack"
},
@ -7391,7 +7391,7 @@
"tag_from": "1.2.1"
}
],
"uri": "git://github.com/openstack/oslo.config.git",
"uri": "git://git.openstack.org/openstack/oslo.config.git",
"module": "oslo.config",
"organization": "openstack"
},
@ -7414,7 +7414,7 @@
}
],
"uri": "git://github.com/openstack/compute-api.git",
"uri": "git://git.openstack.org/openstack/compute-api.git",
"module": "compute-api",
"organization": "openstack"
},
@ -7436,7 +7436,7 @@
"tag_from": "d000b31"
}
],
"uri": "git://github.com/openstack/identity-api.git",
"uri": "git://git.openstack.org/openstack/identity-api.git",
"module": "identity-api",
"organization": "openstack"
},
@ -7459,7 +7459,7 @@
}
],
"uri": "git://github.com/openstack/image-api.git",
"uri": "git://git.openstack.org/openstack/image-api.git",
"module": "image-api",
"organization": "openstack"
},
@ -7482,7 +7482,7 @@
}
],
"uri": "git://github.com/openstack/netconn-api.git",
"uri": "git://git.openstack.org/openstack/netconn-api.git",
"module": "netconn-api",
"organization": "openstack"
},
@ -7505,7 +7505,7 @@
}
],
"uri": "git://github.com/openstack/object-api.git",
"uri": "git://git.openstack.org/openstack/object-api.git",
"module": "object-api",
"organization": "openstack"
},
@ -7527,7 +7527,7 @@
"tag_from": "5b33af5"
}
],
"uri": "git://github.com/openstack/volume-api.git",
"uri": "git://git.openstack.org/openstack/volume-api.git",
"module": "volume-api",
"organization": "openstack"
},
@ -7561,7 +7561,7 @@
"tag_from": "7dcdb23"
}
],
"uri": "git://github.com/openstack/openstack-manuals.git",
"uri": "git://git.openstack.org/openstack/openstack-manuals.git",
"module": "openstack-manuals",
"organization": "openstack"
},
@ -7578,7 +7578,7 @@
"tag_from": "0.11"
}
],
"uri": "git://github.com/openstack/openstack-doc-tools.git",
"uri": "git://git.openstack.org/openstack/openstack-doc-tools.git",
"module": "openstack-doc-tools",
"organization": "openstack"
},
@ -7600,7 +7600,7 @@
"tag_from": "1883cbb"
}
],
"uri": "git://github.com/openstack/operations-guide.git",
"uri": "git://git.openstack.org/openstack/operations-guide.git",
"module": "operations-guide",
"organization": "openstack"
},
@ -7622,7 +7622,7 @@
"tag_from": "b951d9651"
}
],
"uri": "git://github.com/openstack/api-site.git",
"uri": "git://git.openstack.org/openstack/api-site.git",
"module": "api-site",
"organization": "openstack"
},
@ -7631,7 +7631,7 @@
"aliases": [
"savanna"
],
"uri": "git://github.com/openstack/sahara.git",
"uri": "git://git.openstack.org/openstack/sahara.git",
"organization": "openstack",
"releases": [
{
@ -7654,7 +7654,7 @@
},
{
"module": "sahara-dashboard",
"uri": "git://github.com/openstack/sahara-dashboard.git",
"uri": "git://git.openstack.org/openstack/sahara-dashboard.git",
"organization": "openstack",
"releases": [
{
@ -7671,7 +7671,7 @@
},
{
"module": "python-saharaclient",
"uri": "git://github.com/openstack/python-saharaclient.git",
"uri": "git://git.openstack.org/openstack/python-saharaclient.git",
"organization": "openstack",
"releases": [
{
@ -7691,7 +7691,7 @@
"aliases": [
"fuel"
],
"uri": "git://github.com/stackforge/fuel-main.git",
"uri": "git://git.openstack.org/stackforge/fuel-main.git",
"organization": "stackforge"
}
],

6
etc/stackalytics.conf
View File

@ -3,7 +3,7 @@
# debug = False
# Default data
# default_data_uri = https://raw.github.com/stackforge/stackalytics/master/etc/default_data.json
# default_data_uri = https://git.openstack.org/cgit/stackforge/stackalytics/plain/etc/default_data.json
# The folder that holds all project sources to analyze
# sources_root = /var/local/stackalytics
@ -21,7 +21,7 @@
# days_to_update_members = 7
# The address of file with corrections data
# corrections_uri = https://raw.github.com/stackforge/stackalytics/master/etc/corrections.json
# corrections_uri = https://git.openstack.org/cgit/stackforge/stackalytics/plain/etc/corrections.json
# URI of review system
# review_uri = gerrit://review.openstack.org
@ -36,7 +36,7 @@
# force_update = False
# The address of file with list of programs
# program_list_uri = https://raw.github.com/openstack/governance/master/reference/programs.yaml
# program_list_uri = https://git.openstack.org/cgit/openstack/governance/plain/reference/programs.yaml
# Default metric
# default_metric = marks

6
etc/test_default_data.json
View File

@ -86,19 +86,19 @@
"tag_from": "2014.1"
}
],
"uri": "git://github.com/openstack/glance.git",
"uri": "git://git.openstack.org/openstack/glance.git",
"module": "glance",
"organization": "openstack"
},
{
"module": "python-glanceclient",
"organization": "openstack",
"uri": "git://github.com/openstack/python-glanceclient.git"
"uri": "git://git.openstack.org/openstack/python-glanceclient.git"
},
{
"module": "stackalytics",
"organization": "stackforge",
"uri": "git://github.com/stackforge/stackalytics.git"
"uri": "git://git.openstack.org/stackforge/stackalytics.git"
}
],

12
stackalytics/processor/config.py
View File

@ -18,8 +18,8 @@ from oslo.config import cfg
OPTS = [
cfg.StrOpt('default-data-uri',
default='https://raw.github.com/stackforge/stackalytics/'
'master/etc/default_data.json',
default='https://git.openstack.org/cgit/'
'stackforge/stackalytics/plain/etc/default_data.json',
help='URI for default data'),
cfg.StrOpt('sources-root', default='/var/local/stackalytics',
help='The folder that holds all project sources to analyze'),
@ -32,8 +32,8 @@ OPTS = [
cfg.IntOpt('days_to_update_members', default=7,
help='Number of days to update members'),
cfg.StrOpt('corrections-uri',
default=('https://raw.github.com/stackforge/stackalytics/'
'master/etc/corrections.json'),
default=('https://git.openstack.org/cgit/'
'stackforge/stackalytics/plain/etc/corrections.json'),
help='The address of file with corrections data'),
cfg.StrOpt('review-uri', default='gerrit://review.openstack.org',
help='URI of review system'),
@ -44,8 +44,8 @@ OPTS = [
cfg.BoolOpt('force-update', default=False,
help='Forcibly read default data and update records'),
cfg.StrOpt('program-list-uri',
default=('https://raw.github.com/openstack/governance/'
'master/reference/programs.yaml'),
default=('https://git.openstack.org/cgit/'
'openstack/governance/plain/reference/programs.yaml'),
help='The address of file with list of programs'),
cfg.StrOpt('default-metric', default='marks',
help='Default metric'),

26
tests/api/test_companies.py
View File

@ -22,12 +22,13 @@ class TestAPICompanies(test_api.TestAPI):
def test_get_companies(self):
with test_api.make_runtime_storage(
{'repos': [{'module': 'nova', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://github.com/openstack/nova.git'},
{'module': 'glance', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://github.com/openstack/glance.git'}],
{'repos': [
{'module': 'nova', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/nova.git'},
{'module': 'glance', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/glance.git'}],
'project_types': [
{'id': 'openstack', 'title': 'OpenStack',
'modules': ['nova', 'glance']}
@ -76,12 +77,13 @@ class TestAPICompanies(test_api.TestAPI):
def test_get_company(self):
with test_api.make_runtime_storage(
{'repos': [{'module': 'nova', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://github.com/openstack/nova.git'},
{'module': 'glance', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://github.com/openstack/glance.git'}]},
{'repos': [
{'module': 'nova', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/nova.git'},
{'module': 'glance', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/glance.git'}]},
test_api.make_records(record_type=['commit'],
loc=[10, 20, 30],
module=['glance'],

14
tests/api/test_modules.py
View File

@ -22,10 +22,11 @@ class TestAPIModules(test_api.TestAPI):
def test_get_modules(self):
with test_api.make_runtime_storage(
{'repos': [{'module': 'nova', 'organization': 'openstack',
'uri': 'git://github.com/openstack/nova.git'},
{'module': 'glance', 'organization': 'openstack',
'uri': 'git://github.com/openstack/glance.git'}],
{'repos': [
{'module': 'nova', 'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/nova.git'},
{'module': 'glance', 'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/glance.git'}],
'module_groups': {
'nova-group': {'id': 'nova-group',
'module_group_name': 'nova-group',
@ -74,8 +75,9 @@ class TestAPIModules(test_api.TestAPI):
def test_get_module(self):
with test_api.make_runtime_storage(
{'repos': [{'module': 'nova', 'organization': 'openstack',
'uri': 'git://github.com/openstack/nova.git'}],
{'repos': [
{'module': 'nova', 'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/nova.git'}],
'module_groups': {
'nova-group': {'id': 'nova-group',
'module_group_name': 'nova-group',

35
tests/api/test_stats.py
View File

@ -22,10 +22,11 @@ class TestAPIStats(test_api.TestAPI):
def test_get_modules(self):
with test_api.make_runtime_storage(
{'repos': [{'module': 'nova', 'organization': 'openstack',
'uri': 'git://github.com/openstack/nova.git'},
{'module': 'glance', 'organization': 'openstack',
'uri': 'git://github.com/openstack/glance.git'}],
{'repos': [
{'module': 'nova', 'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/nova.git'},
{'module': 'glance', 'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/glance.git'}],
'releases': [{'release_name': 'prehistory',
'end_date': 1234567890},
{'release_name': 'icehouse',
@ -58,12 +59,13 @@ class TestAPIStats(test_api.TestAPI):
def test_get_engineers(self):
with test_api.make_runtime_storage(
{'repos': [{'module': 'nova', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://github.com/openstack/nova.git'},
{'module': 'glance', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://github.com/openstack/glance.git'}],
{'repos': [
{'module': 'nova', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/nova.git'},
{'module': 'glance', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/glance.git'}],
'releases': [{'release_name': 'prehistory',
'end_date': 1234567890},
{'release_name': 'icehouse',
@ -110,12 +112,13 @@ class TestAPIStats(test_api.TestAPI):
def test_get_engineers_extended(self):
with test_api.make_runtime_storage(
{'repos': [{'module': 'nova', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://github.com/openstack/nova.git'},
{'module': 'glance', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://github.com/openstack/glance.git'}],
{'repos': [
{'module': 'nova', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/nova.git'},
{'module': 'glance', 'project_type': 'openstack',
'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/glance.git'}],
'releases': [{'release_name': 'prehistory',
'end_date': 1234567890},
{'release_name': 'icehouse',

10
tests/api/test_users.py
View File

@ -22,8 +22,9 @@ class TestAPIUsers(test_api.TestAPI):
def test_users(self):
with test_api.make_runtime_storage(
{'repos': [{'module': 'nova', 'organization': 'openstack',
'uri': 'git://github.com/openstack/nova.git'}],
{'repos': [
{'module': 'nova', 'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/nova.git'}],
'project_types': [
{'id': 'openstack', 'title': 'openstack',
'modules': ['nova', 'glance']}],
@ -63,8 +64,9 @@ class TestAPIUsers(test_api.TestAPI):
'seq': 1, 'user_id': 'john_doe', 'user_name': 'John Doe',
'companies': [{'company_name': 'NEC', 'end_date': 0}],
'emails': 'john_doe@gmail.com'},
'repos': [{'module': 'nova', 'organization': 'openstack',
'uri': 'git://github.com/openstack/nova.git'}],
'repos': [
{'module': 'nova', 'organization': 'openstack',
'uri': 'git://git.openstack.org/openstack/nova.git'}],
'module_groups': {'openstack': {
'module_group_name': 'openstack',
'modules': ['nova']}}},

2
tests/unit/test_data.py
View File

@ -53,7 +53,7 @@ DEFAULT_DATA = {
'branches': ['master'],
'module': 'stackalytics',
'project_type': 'stackforge',
'uri': 'git://github.com/stackforge/stackalytics.git'
'uri': 'git://git.openstack.org/stackforge/stackalytics.git'
}
],
'releases': [

11
tests/unit/test_default_data_processor.py
View File

@ -56,16 +56,19 @@ class TestDefaultDataProcessor(testtools.TestCase):
with mock.patch('stackalytics.processor.default_data_processor.'
'_retrieve_project_list_from_github') as retriever:
retriever.return_value = [
{'module': 'nova', 'uri': 'git://github.com/openstack/nova',
{'module': 'nova',
'uri': 'git://git.openstack.org/openstack/nova',
'organization': 'openstack'},
{'module': 'qa', 'uri': 'git://github.com/openstack/qa',
{'module': 'qa', 'uri': 'git://git.openstack.org/openstack/qa',
'organization': 'openstack'},
]
dd = {
'repos': [
{'module': 'qa', 'uri': 'git://github.com/openstack/qa',
{'module': 'qa',
'uri': 'git://git.openstack.org/openstack/qa',
'organization': 'openstack'},
{'module': 'tux', 'uri': 'git://github.com/stackforge/tux',
{'module': 'tux',
'uri': 'git://git.openstack.org/stackforge/tux',
'organization': 'stackforge'},
],
'project_sources': [{'organization': 'openstack',

2
tests/unit/test_record_processor.py
View File

@ -45,7 +45,7 @@ REPOS = [
"branches": ["master"],
"module": "stackalytics",
"project_type": "stackforge",
"uri": "git://github.com/stackforge/stackalytics.git"
"uri": "git://git.openstack.org/stackforge/stackalytics.git"
}
]

2
tests/unit/test_vcs.py
View File

@ -25,7 +25,7 @@ class TestVcsProcessor(testtools.TestCase):
self.repo = {
'module': 'dummy',
'uri': 'git://github.com/dummy.git',
'uri': 'git://git.openstack.org/dummy.git',
'releases': []
}
self.git = vcs.Git(self.repo, '/tmp')