diff --git a/etc/default_data.json b/etc/default_data.json index 6726790c3..ae3ac97a9 100644 --- a/etc/default_data.json +++ b/etc/default_data.json @@ -35106,7 +35106,7 @@ "tag_from": "18.0.0.0rc1" } ], - "uri": "git://git.openstack.org/openstack/nova.git", + "uri": "https://git.openstack.org/openstack/nova.git", "module": "nova", "organization": "openstack" }, @@ -35196,7 +35196,7 @@ "tag_from": "14.0.0.0rc1" } ], - "uri": "git://git.openstack.org/openstack/keystone.git", + "uri": "https://git.openstack.org/openstack/keystone.git", "module": "keystone", "organization": "openstack" }, @@ -35281,7 +35281,7 @@ "tag_from": "13.0.0.0rc1" } ], - "uri": "git://git.openstack.org/openstack/cinder.git", + "uri": "https://git.openstack.org/openstack/cinder.git", "module": "cinder", "organization": "openstack" }, @@ -35294,7 +35294,7 @@ "tag_from": "00313fdb" } ], - "uri": "git://git.openstack.org/openstack/deb-auto-backports.git", + "uri": "https://git.openstack.org/openstack/deb-auto-backports.git", "module": "deb-auto-backports", "organization": "openstack" }, @@ -35384,7 +35384,7 @@ "tag_from": "17.0.0.0rc1" } ], - "uri": "git://git.openstack.org/openstack/glance.git", + "uri": "https://git.openstack.org/openstack/glance.git", "module": "glance", "organization": "openstack" }, @@ -35486,7 +35486,7 @@ "release_name": "Liberty" } ], - "uri": "git://git.openstack.org/openstack/neutron.git", + "uri": "https://git.openstack.org/openstack/neutron.git", "module": "neutron", "organization": "openstack" }, @@ -35576,7 +35576,7 @@ "tag_from": "14.0.0.0rc1" } ], - "uri": "git://git.openstack.org/openstack/horizon.git", + "uri": "https://git.openstack.org/openstack/horizon.git", "module": "horizon", "organization": "openstack" }, @@ -35660,7 +35660,7 @@ "tag_from": "2.17.0" } ], - "uri": "git://git.openstack.org/openstack/swift.git", + "uri": "https://git.openstack.org/openstack/swift.git", "module": "swift", "organization": "openstack" }, @@ -35722,7 +35722,7 @@ "tag_from": "3.10.0" } ], - "uri": "git://git.openstack.org/openstack/python-keystoneclient.git", + "uri": "https://git.openstack.org/openstack/python-keystoneclient.git", "module": "python-keystoneclient", "organization": "openstack" }, @@ -35784,7 +35784,7 @@ "tag_from": "7.1.0" } ], - "uri": "git://git.openstack.org/openstack/python-novaclient.git", + "uri": "https://git.openstack.org/openstack/python-novaclient.git", "module": "python-novaclient", "organization": "openstack" }, @@ -35841,7 +35841,7 @@ "tag_from": "1.11.0" } ], - "uri": "git://git.openstack.org/openstack/python-cinderclient.git", + "uri": "https://git.openstack.org/openstack/python-cinderclient.git", "module": "python-cinderclient", "organization": "openstack" }, @@ -35899,7 +35899,7 @@ } ], - "uri": "git://git.openstack.org/openstack/python-glanceclient.git", + "uri": "https://git.openstack.org/openstack/python-glanceclient.git", "module": "python-glanceclient", "organization": "openstack" }, @@ -35961,7 +35961,7 @@ "tag_from": "6.1.0" } ], - "uri": "git://git.openstack.org/openstack/python-neutronclient.git", + "uri": "https://git.openstack.org/openstack/python-neutronclient.git", "module": "python-neutronclient", "organization": "openstack" }, @@ -36018,7 +36018,7 @@ "tag_from": "3.3.0" } ], - "uri": "git://git.openstack.org/openstack/python-swiftclient.git", + "uri": "https://git.openstack.org/openstack/python-swiftclient.git", "module": "python-swiftclient", "organization": "openstack" }, @@ -36098,7 +36098,7 @@ "tag_from": "11.0.0.0rc1" } ], - "uri": "git://git.openstack.org/openstack/heat.git", + "uri": "https://git.openstack.org/openstack/heat.git", "module": "heat", "organization": "openstack" }, @@ -36155,7 +36155,7 @@ "tag_from": "1.8.0" } ], - "uri": "git://git.openstack.org/openstack/python-heatclient.git", + "uri": "https://git.openstack.org/openstack/python-heatclient.git", "module": "python-heatclient", "organization": "openstack" }, @@ -36224,7 +36224,7 @@ "tag_from": "10.0.0" } ], - "uri": "git://git.openstack.org/openstack/ceilometer.git", + "uri": "https://git.openstack.org/openstack/ceilometer.git", "module": "ceilometer", "organization": "openstack" }, @@ -36241,7 +36241,7 @@ "tag_from": "1.0.6" } ], - "uri": "git://git.openstack.org/openstack/python-ceilometerclient.git", + "uri": "https://git.openstack.org/openstack/python-ceilometerclient.git", "module": "python-ceilometerclient", "organization": "openstack" }, @@ -36274,7 +36274,7 @@ "tag_from": "2015.1.0" } ], - "uri": "git://git.openstack.org/openstack/oslo-incubator.git", + "uri": "https://git.openstack.org/openstack/oslo-incubator.git", "module": "oslo-incubator", "organization": "openstack" }, @@ -36291,7 +36291,7 @@ "tag_from": "1.2.1" } ], - "uri": "git://git.openstack.org/openstack/oslo.config.git", + "uri": "https://git.openstack.org/openstack/oslo.config.git", "module": "oslo.config", "organization": "openstack" }, @@ -36323,7 +36323,7 @@ "tag_from": "7dcdb23" } ], - "uri": "git://git.openstack.org/openstack/openstack-manuals.git", + "uri": "https://git.openstack.org/openstack/openstack-manuals.git", "module": "openstack-manuals", "organization": "openstack" }, @@ -36340,7 +36340,7 @@ "tag_from": "0.11" } ], - "uri": "git://git.openstack.org/openstack/openstack-doc-tools.git", + "uri": "https://git.openstack.org/openstack/openstack-doc-tools.git", "module": "openstack-doc-tools", "organization": "openstack" }, @@ -36357,7 +36357,7 @@ "tag_from": "2013.2" } ], - "uri": "git://git.openstack.org/openstack/operations-guide.git", + "uri": "https://git.openstack.org/openstack/operations-guide.git", "module": "operations-guide", "organization": "openstack" }, @@ -36374,7 +36374,7 @@ "tag_from": "15cfe96" } ], - "uri": "git://git.openstack.org/openstack/training-guides.git", + "uri": "https://git.openstack.org/openstack/training-guides.git", "module": "training-guides", "organization": "openstack" }, @@ -36391,7 +36391,7 @@ "tag_from": "2013.2" } ], - "uri": "git://git.openstack.org/openstack/api-site.git", + "uri": "https://git.openstack.org/openstack/api-site.git", "module": "api-site", "organization": "openstack" }, @@ -36400,7 +36400,7 @@ "aliases": [ "savanna" ], - "uri": "git://git.openstack.org/openstack/sahara.git", + "uri": "https://git.openstack.org/openstack/sahara.git", "organization": "openstack", "releases": [ { @@ -36475,7 +36475,7 @@ }, { "module": "sahara-dashboard", - "uri": "git://git.openstack.org/openstack/sahara-dashboard.git", + "uri": "https://git.openstack.org/openstack/sahara-dashboard.git", "organization": "openstack", "releases": [ { @@ -36492,7 +36492,7 @@ }, { "module": "python-saharaclient", - "uri": "git://git.openstack.org/openstack/python-saharaclient.git", + "uri": "https://git.openstack.org/openstack/python-saharaclient.git", "organization": "openstack", "releases": [ { @@ -36547,22 +36547,22 @@ "aliases": [ "fuel" ], - "uri": "git://git.openstack.org/openstack/fuel-main.git", + "uri": "https://git.openstack.org/openstack/fuel-main.git", "organization": "openstack" }, { "module": "api-wg", - "uri": "git://git.openstack.org/openstack/api-wg.git", + "uri": "https://git.openstack.org/openstack/api-wg.git", "organization": "openstack" }, { "module": "openstack-user-stories", - "uri": "git://git.openstack.org/openstack/openstack-user-stories.git", + "uri": "https://git.openstack.org/openstack/openstack-user-stories.git", "organization": "openstack" }, { "module": "vmware-nsx", - "uri": "git://git.openstack.org/openstack/vmware-nsx.git", + "uri": "https://git.openstack.org/openstack/vmware-nsx.git", "organization": "openstack", "releases": [ { @@ -36574,7 +36574,7 @@ }, { "module": "oslo.versionedobjects", - "uri": "git://git.openstack.org/openstack/oslo.versionedobjects.git", + "uri": "https://git.openstack.org/openstack/oslo.versionedobjects.git", "organization": "openstack", "releases": [ { @@ -37059,7 +37059,7 @@ { "module": "barbican", "organization": "openstack", - "uri": "git://git.openstack.org/openstack/barbican.git", + "uri": "https://git.openstack.org/openstack/barbican.git", "releases": [ { "tag_to": "juno-eol", @@ -37124,7 +37124,7 @@ { "module": "zaqar", "organization": "openstack", - "uri": "git://git.openstack.org/openstack/zaqar.git", + "uri": "https://git.openstack.org/openstack/zaqar.git", "releases": [ { "tag_to": "icehouse-eol", @@ -37187,7 +37187,7 @@ { "module": "python-zaqarclient", "organization": "openstack", - "uri": "git://git.openstack.org/openstack/python-zaqarclient.git", + "uri": "https://git.openstack.org/openstack/python-zaqarclient.git", "releases": [ { "tag_to": "0.1.0", @@ -37234,7 +37234,7 @@ { "module": "kayobe", "organization": "openstack", - "uri": "git://git.openstack.org/openstack/kayobe.git", + "uri": "https://git.openstack.org/openstack/kayobe.git", "releases": [ { "branch": "stable/ocata", @@ -37585,7 +37585,7 @@ "aliases": [ "smaug" ], - "uri": "git://git.openstack.org/openstack/karbor.git", + "uri": "https://git.openstack.org/openstack/karbor.git", "organization": "openstack" }, { @@ -37593,7 +37593,7 @@ "aliases": [ "python-smaugclient" ], - "uri": "git://git.openstack.org/openstack/python-karborclient.git", + "uri": "https://git.openstack.org/openstack/python-karborclient.git", "organization": "openstack" }, { @@ -37601,7 +37601,7 @@ "aliases": [ "smaug-dashboard" ], - "uri": "git://git.openstack.org/openstack/karbor-dashboard.git", + "uri": "https://git.openstack.org/openstack/karbor-dashboard.git", "organization": "openstack" }, { @@ -37609,7 +37609,7 @@ "aliases": [ "nimble" ], - "uri": "git://git.openstack.org/openstack/mogan.git", + "uri": "https://git.openstack.org/openstack/mogan.git", "organization": "openstack" }, { @@ -37617,7 +37617,7 @@ "aliases": [ "python-nimbleclient" ], - "uri": "git://git.openstack.org/openstack/python-moganclient.git", + "uri": "https://git.openstack.org/openstack/python-moganclient.git", "organization": "openstack" }, { diff --git a/etc/stackalytics.conf b/etc/stackalytics.conf index 79749eb60..adc98c53f 100644 --- a/etc/stackalytics.conf +++ b/etc/stackalytics.conf @@ -162,7 +162,7 @@ #review_uri = gerrit://review.openstack.org # git base location (string value) -#git_base_uri = git://git.openstack.org +#git_base_uri = https://git.openstack.org # SSH key for gerrit review system access (string value) #ssh_key_filename = /home/user/.ssh/id_rsa diff --git a/etc/test_default_data.json b/etc/test_default_data.json index 3a5738bdb..c67efba80 100644 --- a/etc/test_default_data.json +++ b/etc/test_default_data.json @@ -138,19 +138,19 @@ "tag_from": "17.0.0.0rc1" } ], - "uri": "git://git.openstack.org/openstack/glance.git", + "uri": "https://git.openstack.org/openstack/glance.git", "module": "glance", "organization": "openstack" }, { "module": "python-glanceclient", "organization": "openstack", - "uri": "git://git.openstack.org/openstack/python-glanceclient.git" + "uri": "https://git.openstack.org/openstack/python-glanceclient.git" }, { "module": "stackalytics", "organization": "openstack", - "uri": "git://git.openstack.org/openstack/stackalytics.git" + "uri": "https://git.openstack.org/openstack/stackalytics.git" } ], diff --git a/stackalytics/processor/config.py b/stackalytics/processor/config.py index f731ad77a..060bab09c 100644 --- a/stackalytics/processor/config.py +++ b/stackalytics/processor/config.py @@ -40,7 +40,7 @@ PROCESSOR_OPTS = [ help='The address of file with corrections data'), cfg.StrOpt('review-uri', default='gerrit://review.openstack.org', help='URI of review system'), - cfg.StrOpt('git-base-uri', default='git://git.openstack.org', + cfg.StrOpt('git-base-uri', default='https://git.openstack.org', help='git base location'), cfg.StrOpt('ssh-key-filename', default='/home/user/.ssh/id_rsa', help='SSH key for gerrit review system access'), diff --git a/stackalytics/tests/api/test_companies.py b/stackalytics/tests/api/test_companies.py index 6a0579786..b993b0fe3 100644 --- a/stackalytics/tests/api/test_companies.py +++ b/stackalytics/tests/api/test_companies.py @@ -24,10 +24,10 @@ class TestAPICompanies(test_api.TestAPI): 'repos': [ {'module': 'nova', 'project_type': 'openstack', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/nova.git'}, + 'uri': 'https://git.openstack.org/openstack/nova.git'}, {'module': 'glance', 'project_type': 'openstack', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/glance.git'} + 'uri': 'https://git.openstack.org/openstack/glance.git'} ], 'project_types': [ {'id': 'openstack', 'title': 'OpenStack', @@ -80,10 +80,10 @@ class TestAPICompanies(test_api.TestAPI): 'repos': [ {'module': 'nova', 'project_type': 'openstack', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/nova.git'}, + 'uri': 'https://git.openstack.org/openstack/nova.git'}, {'module': 'glance', 'project_type': 'openstack', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/glance.git'} + 'uri': 'https://git.openstack.org/openstack/glance.git'} ], 'module_groups': { 'nova': test_api.make_module('nova'), diff --git a/stackalytics/tests/api/test_modules.py b/stackalytics/tests/api/test_modules.py index e4ad64b59..43927b342 100644 --- a/stackalytics/tests/api/test_modules.py +++ b/stackalytics/tests/api/test_modules.py @@ -23,9 +23,9 @@ class TestAPIModules(test_api.TestAPI): { 'repos': [ {'module': 'nova', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/nova.git'}, + 'uri': 'https://git.openstack.org/openstack/nova.git'}, {'module': 'glance', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/glance.git'} + 'uri': 'https://git.openstack.org/openstack/glance.git'} ], 'module_groups': { 'nova-group': {'id': 'nova-group', @@ -78,7 +78,7 @@ class TestAPIModules(test_api.TestAPI): { 'repos': [ {'module': 'nova', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/nova.git'}], + 'uri': 'https://git.openstack.org/openstack/nova.git'}], 'module_groups': { 'nova-group': {'id': 'nova-group', 'module_group_name': 'nova-group', @@ -105,7 +105,7 @@ class TestAPIModules(test_api.TestAPI): 'modules': [ {'module_name': 'nova', 'visible': True, - 'repo_uri': 'git://git.openstack.org/openstack/nova.git'} + 'repo_uri': 'https://git.openstack.org/openstack/nova.git'} ], 'name': 'Nova', 'tag': 'module'}, module) @@ -116,7 +116,7 @@ class TestAPIModules(test_api.TestAPI): 'modules': [{ 'module_name': 'nova', 'visible': True, - 'repo_uri': 'git://git.openstack.org/openstack/nova.git'}, + 'repo_uri': 'https://git.openstack.org/openstack/nova.git'}, {'module_name': 'nova-cli', 'visible': False}, ], 'name': 'Nova-group', 'tag': 'group'}, module) diff --git a/stackalytics/tests/api/test_stats.py b/stackalytics/tests/api/test_stats.py index 9be761662..7b12b161b 100644 --- a/stackalytics/tests/api/test_stats.py +++ b/stackalytics/tests/api/test_stats.py @@ -23,9 +23,9 @@ class TestAPIStats(test_api.TestAPI): { 'repos': [ {'module': 'nova', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/nova.git'}, + 'uri': 'https://git.openstack.org/openstack/nova.git'}, {'module': 'glance', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/glance.git'} + 'uri': 'https://git.openstack.org/openstack/glance.git'} ], 'releases': [{'release_name': 'prehistory', 'end_date': 1234567890}, @@ -63,10 +63,10 @@ class TestAPIStats(test_api.TestAPI): 'repos': [ {'module': 'nova', 'project_type': 'openstack', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/nova.git'}, + 'uri': 'https://git.openstack.org/openstack/nova.git'}, {'module': 'glance', 'project_type': 'openstack', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/glance.git'} + 'uri': 'https://git.openstack.org/openstack/glance.git'} ], 'releases': [{'release_name': 'prehistory', 'end_date': 1234567890}, @@ -119,10 +119,10 @@ class TestAPIStats(test_api.TestAPI): 'repos': [ {'module': 'nova', 'project_type': 'openstack', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/nova.git'}, + 'uri': 'https://git.openstack.org/openstack/nova.git'}, {'module': 'glance', 'project_type': 'openstack', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/glance.git'} + 'uri': 'https://git.openstack.org/openstack/glance.git'} ], 'releases': [{'release_name': 'prehistory', 'end_date': 1234567890}, diff --git a/stackalytics/tests/api/test_users.py b/stackalytics/tests/api/test_users.py index b14121c7e..60e4977b3 100644 --- a/stackalytics/tests/api/test_users.py +++ b/stackalytics/tests/api/test_users.py @@ -22,7 +22,7 @@ class TestAPIUsers(test_api.TestAPI): with test_api.make_runtime_storage( {'repos': [ {'module': 'nova', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/nova.git'}], + 'uri': 'https://git.openstack.org/openstack/nova.git'}], 'project_types': [ {'id': 'openstack', 'title': 'openstack', 'modules': ['nova', 'glance']}], @@ -64,7 +64,7 @@ class TestAPIUsers(test_api.TestAPI): 'emails': 'john_doe@gmail.com'}, 'repos': [ {'module': 'nova', 'organization': 'openstack', - 'uri': 'git://git.openstack.org/openstack/nova.git'}], + 'uri': 'https://git.openstack.org/openstack/nova.git'}], 'module_groups': {'openstack': { 'module_group_name': 'openstack', 'modules': ['nova']}}}, diff --git a/stackalytics/tests/unit/test_data.py b/stackalytics/tests/unit/test_data.py index 355e15da9..34fb6f089 100644 --- a/stackalytics/tests/unit/test_data.py +++ b/stackalytics/tests/unit/test_data.py @@ -62,7 +62,7 @@ DEFAULT_DATA = { 'branches': ['master'], 'module': 'stackalytics', 'project_type': 'stackforge', - 'uri': 'git://git.openstack.org/stackforge/stackalytics.git' + 'uri': 'https://git.openstack.org/stackforge/stackalytics.git' } ], 'releases': [ diff --git a/stackalytics/tests/unit/test_default_data_processor.py b/stackalytics/tests/unit/test_default_data_processor.py index 498efe9a0..74e275c7c 100644 --- a/stackalytics/tests/unit/test_default_data_processor.py +++ b/stackalytics/tests/unit/test_default_data_processor.py @@ -62,22 +62,22 @@ class TestDefaultDataProcessor(testtools.TestCase): '_retrieve_project_list_from_gerrit') as retriever: retriever.return_value = [ {'module': 'nova', - 'uri': 'git://git.openstack.org/openstack/nova', + 'uri': 'https://git.openstack.org/openstack/nova', 'organization': 'openstack'}, - {'module': 'qa', 'uri': 'git://git.openstack.org/openstack/qa', + {'module': 'qa', 'uri': 'https://git.openstack.org/openstack/qa', 'has_gerrit': True, 'organization': 'openstack'}, {'module': 'deb-nova', - 'uri': 'git://git.openstack.org/openstack/deb-nova', + 'uri': 'https://git.openstack.org/openstack/deb-nova', 'organization': 'openstack'}, ] dd = { 'repos': [ {'module': 'qa', - 'uri': 'git://git.openstack.org/openstack/qa', + 'uri': 'https://git.openstack.org/openstack/qa', 'organization': 'openstack'}, {'module': 'tux', - 'uri': 'git://git.openstack.org/stackforge/tux', + 'uri': 'https://git.openstack.org/stackforge/tux', 'organization': 'stackforge'}, ], 'project_sources': [{'organization': 'openstack', diff --git a/stackalytics/tests/unit/test_record_processor.py b/stackalytics/tests/unit/test_record_processor.py index 888dbc0d9..047e7c91f 100644 --- a/stackalytics/tests/unit/test_record_processor.py +++ b/stackalytics/tests/unit/test_record_processor.py @@ -50,7 +50,7 @@ REPOS = [ "branches": ["master"], "module": "stackalytics", "project_type": "stackforge", - "uri": "git://git.openstack.org/stackforge/stackalytics.git" + "uri": "https://git.openstack.org/stackforge/stackalytics.git" } ] diff --git a/stackalytics/tests/unit/test_vcs.py b/stackalytics/tests/unit/test_vcs.py index 57a4c180d..90ded46ae 100644 --- a/stackalytics/tests/unit/test_vcs.py +++ b/stackalytics/tests/unit/test_vcs.py @@ -25,7 +25,7 @@ class TestVcsProcessor(testtools.TestCase): self.repo = { 'module': 'dummy', - 'uri': 'git://git.openstack.org/dummy.git', + 'uri': 'https://git.openstack.org/dummy.git', 'releases': [] } self.git = vcs.Git(self.repo, '/tmp')