Browse code

Merge "Switch GIT_BASE to https://"

Zuul authored on 2019/03/13 06:35:29
Showing 2 changed files
... ...
@@ -40,9 +40,9 @@ class TestDevstackLocalConf(unittest.TestCase):
40 40
         # We use ordereddict here to make sure the plugins are in the
41 41
         # *wrong* order for testing.
42 42
         plugins = OrderedDict([
43
-            ('bar', 'git://git.openstack.org/openstack/bar-plugin'),
44
-            ('foo', 'git://git.openstack.org/openstack/foo-plugin'),
45
-            ('baz', 'git://git.openstack.org/openstack/baz-plugin'),
43
+            ('bar', 'https://git.openstack.org/openstack/bar-plugin'),
44
+            ('foo', 'https://git.openstack.org/openstack/foo-plugin'),
45
+            ('baz', 'https://git.openstack.org/openstack/baz-plugin'),
46 46
             ])
47 47
         p = dict(localrc=localrc,
48 48
                  local_conf=local_conf,
... ...
@@ -94,8 +94,8 @@ class TestDevstackLocalConf(unittest.TestCase):
94 94
         # We use ordereddict here to make sure the plugins are in the
95 95
         # *wrong* order for testing.
96 96
         plugins = OrderedDict([
97
-            ('bar-plugin', 'git://git.openstack.org/openstack/bar-plugin'),
98
-            ('foo-plugin', 'git://git.openstack.org/openstack/foo-plugin'),
97
+            ('bar-plugin', 'https://git.openstack.org/openstack/bar-plugin'),
98
+            ('foo-plugin', 'https://git.openstack.org/openstack/foo-plugin'),
99 99
             ])
100 100
         p = dict(localrc=localrc,
101 101
                  local_conf=local_conf,
... ...
@@ -227,8 +227,8 @@ class TestDevstackLocalConf(unittest.TestCase):
227 227
         # We use ordereddict here to make sure the plugins are in the
228 228
         # *wrong* order for testing.
229 229
         plugins = OrderedDict([
230
-            ('bar', 'git://git.openstack.org/openstack/bar-plugin'),
231
-            ('foo', 'git://git.openstack.org/openstack/foo-plugin'),
230
+            ('bar', 'https://git.openstack.org/openstack/bar-plugin'),
231
+            ('foo', 'https://git.openstack.org/openstack/foo-plugin'),
232 232
             ])
233 233
         p = dict(localrc=localrc,
234 234
                  local_conf=local_conf,
... ...
@@ -237,8 +237,7 @@ WSGI_MODE=${WSGI_MODE:-"uwsgi"}
237 237
 # ------------
238 238
 
239 239
 # Base GIT Repo URL
240
-# Another option is https://git.openstack.org
241
-GIT_BASE=${GIT_BASE:-git://git.openstack.org}
240
+GIT_BASE=${GIT_BASE:-https://git.openstack.org}
242 241
 
243 242
 # The location of REQUIREMENTS once cloned
244 243
 REQUIREMENTS_DIR=$DEST/requirements