Merge "Switch GIT_BASE to https://"

This commit is contained in:
Zuul 2019-03-12 21:35:29 +00:00 committed by Gerrit Code Review
commit 5ad2f21233
2 changed files with 8 additions and 9 deletions

View File

@ -40,9 +40,9 @@ class TestDevstackLocalConf(unittest.TestCase):
# We use ordereddict here to make sure the plugins are in the
# *wrong* order for testing.
plugins = OrderedDict([
('bar', 'git://git.openstack.org/openstack/bar-plugin'),
('foo', 'git://git.openstack.org/openstack/foo-plugin'),
('baz', 'git://git.openstack.org/openstack/baz-plugin'),
('bar', 'https://git.openstack.org/openstack/bar-plugin'),
('foo', 'https://git.openstack.org/openstack/foo-plugin'),
('baz', 'https://git.openstack.org/openstack/baz-plugin'),
])
p = dict(localrc=localrc,
local_conf=local_conf,
@ -94,8 +94,8 @@ class TestDevstackLocalConf(unittest.TestCase):
# We use ordereddict here to make sure the plugins are in the
# *wrong* order for testing.
plugins = OrderedDict([
('bar-plugin', 'git://git.openstack.org/openstack/bar-plugin'),
('foo-plugin', 'git://git.openstack.org/openstack/foo-plugin'),
('bar-plugin', 'https://git.openstack.org/openstack/bar-plugin'),
('foo-plugin', 'https://git.openstack.org/openstack/foo-plugin'),
])
p = dict(localrc=localrc,
local_conf=local_conf,
@ -227,8 +227,8 @@ class TestDevstackLocalConf(unittest.TestCase):
# We use ordereddict here to make sure the plugins are in the
# *wrong* order for testing.
plugins = OrderedDict([
('bar', 'git://git.openstack.org/openstack/bar-plugin'),
('foo', 'git://git.openstack.org/openstack/foo-plugin'),
('bar', 'https://git.openstack.org/openstack/bar-plugin'),
('foo', 'https://git.openstack.org/openstack/foo-plugin'),
])
p = dict(localrc=localrc,
local_conf=local_conf,

View File

@ -237,8 +237,7 @@ WSGI_MODE=${WSGI_MODE:-"uwsgi"}
# ------------
# Base GIT Repo URL
# Another option is https://git.openstack.org
GIT_BASE=${GIT_BASE:-git://git.openstack.org}
GIT_BASE=${GIT_BASE:-https://git.openstack.org}
# The location of REQUIREMENTS once cloned
REQUIREMENTS_DIR=$DEST/requirements