openstack
/
tripleo-repos
Code Issues Proposed changes

do not rename dlrn repos for the branch 

tripleo-repos is overriding all the repo
names to the same name delorean-ussuri
which causes yum to puke.

Closes-Bug: #1880036
Change-Id: Ib3c9cf6d5c4a71b1dea51ac45284bb51d9d94651
This commit is contained in:
Wes Hayutin 2020-05-21 16:17:26 -06:00
parent 98f7e150ad
commit 683b7870ec
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_repos/main.py
View File

@ -341,8 +341,6 @@ def _install_repos(args, base_path):
for repo in args.repos:
if repo == 'current':
content = _get_repo(base_path + 'current/delorean.repo', args)
if args.branch != 'master':
content = TITLE_RE.sub('[delorean-%s]' % args.branch, content)
_write_repo(content, args.output_path, name='delorean')
install_deps(args, base_path)
elif repo == 'deps':

2
tripleo_repos/tests/test_main.py
View File

@ -189,7 +189,7 @@ class TestTripleORepos(testtools.TestCase):
mock.call('roads/delorean-deps.repo', args),
],
mock_get.mock_calls)
self.assertEqual([mock.call('[delorean-mitaka]\nMr. Fusion', 'test',
self.assertEqual([mock.call('[delorean]\nMr. Fusion', 'test',
name='delorean'),
mock.call('[delorean]\nMr. Fusion', 'test'),
],