openstack
/
tripleo-repos
Code Issues Proposed changes

Removes checks for branch and current-tripleo/dev 

In Rocky and Queens current-tripleo and current branches exist, so there
is no reason not to allow installing those repos.

Change-Id: I9dd7dc0408005c0c9f3df73a7fb57754620096ff
Signed-off-by: Tim Rozet <trozet@redhat.com>
This commit is contained in:
Tim Rozet 2018-11-14 16:42:34 -05:00
parent 1389b7a9db
commit a5b709edca
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tripleo_repos/main.py
View File

@ -150,22 +150,8 @@ def _validate_current_tripleo(repos):
return True
def _validate_branch_repos(branch, repos):
"""Validate branch and repo combinations
current-tripleo-dev and current-tripleo are master only
"""
if branch == 'master':
return True
if 'current-tripleo-dev' in repos or 'current-tripleo' in repos:
raise InvalidArguments('Cannot use current-tripleo on any branch '
'except master')
return True
def _validate_args(args):
_validate_current_tripleo(args.repos)
_validate_branch_repos(args.branch, args.repos)
if args.distro not in ['centos7', 'fedora']:
raise InvalidArguments('centos7 or fedora is the only supported '
'distros at this time')

12
tripleo_repos/tests/test_main.py
View File

@ -457,12 +457,6 @@ class TestValidate(testtools.TestCase):
self.assertRaises(main.InvalidArguments, main._validate_args,
self.args)
def test_branch_and_tripleo_dev(self):
self.args.repos = ['current-tripleo-dev']
self.args.branch = 'liberty'
self.assertRaises(main.InvalidArguments, main._validate_args,
self.args)
def test_current_and_tripleo(self):
self.args.repos = ['current', 'current-tripleo']
self.assertRaises(main.InvalidArguments, main._validate_args,
@ -472,12 +466,6 @@ class TestValidate(testtools.TestCase):
self.args.repos = ['deps', 'current-tripleo']
main._validate_args(self.args)
def test_branch_and_tripleo(self):
self.args.repos = ['current-tripleo']
self.args.branch = 'liberty'
self.assertRaises(main.InvalidArguments, main._validate_args,
self.args)
def test_invalid_distro(self):
self.args.distro = 'Jigawatts 1.21'
self.assertRaises(main.InvalidArguments, main._validate_args,