openstack
/
fuel-web
Code Issues Proposed changes

Merge "Fix paths to updates and security repositories According to a new scheme of repos"

This commit is contained in:
Jenkins 2015-08-13 16:06:01 +00:00 committed by Gerrit Code Review
parent 35a1989de8 c396551f6b
commit 0089f1ba17
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fuel_upgrade_system/fuel_upgrade/fuel_upgrade/config.py
View File

@ -604,15 +604,17 @@ def config(update_path, admin_password):
master_node_repos = [ master_node_repos = [
{ {
'name': 'mos{0}-updates'.format(new_version), 'name': 'mos{0}-updates'.format(new_version),
'baseurl': 'http://mirror.fuel-infra.org/mos/centos-6/' 'baseurl': 'http://mirror.fuel-infra.org/mos-repos/'
'mos{0}/updates/'.format(new_version), 'centos/mos{0}-centos6-fuel/updates/'
'x86_64/'.format(new_version),
'gpgcheck': 0, 'gpgcheck': 0,
'skip_if_unavailable': 1, 'skip_if_unavailable': 1,
}, },
{ {
'name': 'mos{0}-security'.format(new_version), 'name': 'mos{0}-security'.format(new_version),
'baseurl': 'http://mirror.fuel-infra.org/mos/centos-6/' 'baseurl': 'http://mirror.fuel-infra.org/mos-repos/'
'mos{0}/security/'.format(new_version), 'centos/mos{0}-centos6-fuel/security/'
'x86_64/'.format(new_version),
'gpgcheck': 0, 'gpgcheck': 0,
'skip_if_unavailable': 1, 'skip_if_unavailable': 1,
} }

8
fuel_upgrade_system/fuel_upgrade/fuel_upgrade/tests/test_upgrade_manager.py
View File

@ -191,8 +191,8 @@ class TestUpgradeManager(BaseTestCase):
'/etc/yum.repos.d/mos9999-updates.repo', '/etc/yum.repos.d/mos9999-updates.repo',
{ {
'name': 'mos9999-updates', 'name': 'mos9999-updates',
'baseurl': 'http://mirror.fuel-infra.org/mos/centos-6/' 'baseurl': 'http://mirror.fuel-infra.org/mos-repos/'
'mos9999/updates/', 'centos/mos9999-centos6-fuel/updates/x86_64/',
'gpgcheck': 0, 'gpgcheck': 0,
'skip_if_unavailable': 1, 'skip_if_unavailable': 1,
}), }),
@ -201,8 +201,8 @@ class TestUpgradeManager(BaseTestCase):
'/etc/yum.repos.d/mos9999-security.repo', '/etc/yum.repos.d/mos9999-security.repo',
{ {
'name': 'mos9999-security', 'name': 'mos9999-security',
'baseurl': 'http://mirror.fuel-infra.org/mos/centos-6/' 'baseurl': 'http://mirror.fuel-infra.org/mos-repos/'
'mos9999/security/', 'centos/mos9999-centos6-fuel/security/x86_64/',
'gpgcheck': 0, 'gpgcheck': 0,
'skip_if_unavailable': 1, 'skip_if_unavailable': 1,
}), }),

13
fuel_upgrade_system/fuel_upgrade/fuel_upgrade/tests/test_utils.py
View File

@ -577,17 +577,18 @@ class TestUtils(BaseTestCase):
mopen = mock.mock_open(read_data=template) mopen = mock.mock_open(read_data=template)
with mock.patch('__builtin__.open', mopen, create=True): with mock.patch('__builtin__.open', mopen, create=True):
utils.render_template_to_file('mocked', 'mocked', { utils.render_template_to_file('mocked', 'mocked', {
'name': 'mos6.1-updates', 'name': 'mos7.0-updates',
'baseurl': 'http://mirror.fuel-infra.org/mos/centos-6/' 'baseurl': 'http://mirror.fuel-infra.org/mos-repos/centos/'
'mos6.1/updates/', 'mos7.0-centos6-fuel/updates/x86_64/',
'gpgcheck': 0, 'gpgcheck': 0,
'skip_if_unavailable': 1, 'skip_if_unavailable': 1,
}) })
mopen().write.assert_called_once(textwrap.dedent('''\ mopen().write.assert_called_once(textwrap.dedent('''\
[mos6.1-updates] [mos7.0-updates]
name=mos6.1-updates name=mos7.0-updates
baseurl=http://mirror.fuel-infra.org/mos/centos-6/mos6.1/updates/ baseurl=http://mirror.fuel-infra.org/mos-repos\
/centos/mos7.0-centos6-fuel/updates/x86_64/
gpgcheck=0 gpgcheck=0
skip_if_unavailable=1 skip_if_unavailable=1
''')) '''))