diff --git a/tripleo_repos/main.py b/tripleo_repos/main.py index f9c0213..9fcdcb9 100755 --- a/tripleo_repos/main.py +++ b/tripleo_repos/main.py @@ -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') diff --git a/tripleo_repos/tests/test_main.py b/tripleo_repos/tests/test_main.py index 069ea95..259a0c7 100644 --- a/tripleo_repos/tests/test_main.py +++ b/tripleo_repos/tests/test_main.py @@ -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,