openstack
/
tripleo-repos
Code Issues Proposed changes

Merge "Drop fedora28"

This commit is contained in:
Zuul 2020-12-16 23:34:07 +00:00 committed by Gerrit Code Review
parent 9f95cb8fa3 1f83ec6ef5
commit e596333ff7
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleo_repos/main.py
View File

@ -79,7 +79,6 @@ enabled=1
SUPPORTED_DISTROS = [
('centos', '7'),
('centos', '8'),
('fedora', '28'),
('fedora', ''),
('rhel', '8')
]
@ -283,11 +282,6 @@ def _remove_existing(args):
def _get_base_path(args):
if args.distro == 'fedora28' and \
args.branch not in ['stein', 'master']:
raise InvalidArguments('Only stable/stein and master branches'
'are supported with fedora28.')
# The mirror url with /$DISTRO$VERSION path for master branch is
# deprecated.
# The default for rdo mirrors is $DISTRO$VERSION-$BRANCH

14
tripleo_repos/tests/test_main.py
View File

@ -131,20 +131,6 @@ class TestTripleORepos(testtools.TestCase):
path = main._get_base_path(args)
self.assertEqual('http://trunk.rdoproject.org/fedora-master/', path)
def test_get_base_path_fedora_unsup_branch(self):
args = mock.Mock()
args.branch = 'rocky'
args.distro = 'fedora28'
self.assertRaises(main.InvalidArguments, main._get_base_path, args)
def test_get_base_path_fedora_sup_branch(self):
args = mock.Mock()
args.branch = 'stein'
args.distro = 'fedora28'
args.rdo_mirror = 'http://trunk.rdoproject.org'
path = main._get_base_path(args)
self.assertEqual('http://trunk.rdoproject.org/fedora28-stein/', path)
@mock.patch('subprocess.check_call')
def test_install_priorities(self, mock_check_call):
main._install_priorities()