openstack
/
tripleo-repos
Code Issues Proposed changes

add centos8 highavailability,powertools 

the pacemaker rpms are no longer supplied in delorean-deps,
they have moved to a centos-8 repo.

also add powertools on the advice of rdo team.

centos/8/HighAvailability/x86_64/os
centos/8/PowerTools/x86_64/os

Co-Authored-By: Rafael Folco <rfolco@redhat.com>

Change-Id: I626095e7defc48719524d3b587af27f0c4d57cf0
This commit is contained in:
Wes Hayutin 2020-01-17 10:01:19 -07:00 committed by Rafael Folco
parent 2fedb44cdf
commit bcbb1aed4b
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tripleo_repos/main.py
View File

@ -56,6 +56,24 @@ baseurl=%s/centos/7/opstools/x86_64/
gpgcheck=0
enabled=1
'''
# centos-8 only
HIGHAVAILABILITY_REPO_TEMPLATE = '''
[tripleo-centos-highavailability]
name=tripleo-centos-highavailability
baseurl=%s/centos/8/HighAvailability/x86_64/os/
gpgcheck=0
enabled=1
'''
# centos-8 only
POWERTOOLS_REPO_TEMPLATE = '''
[tripleo-centos-powertools]
name=tripleo-centos-powertools
baseurl=%s/centos/8/PowerTools/x86_64/os/
gpgcheck=0
enabled=1
'''
# unversioned fedora added for backwards compatibility
SUPPORTED_DISTROS = [
('centos', '7'),
@ -172,6 +190,10 @@ def _write_repo(content, target, name=None):
if not m:
raise NoRepoTitle('Could not find repo title in: \n%s' % content)
name = m.group(1)
# centos-8 dlrn repos have changed. repos per component
# are folded into a single repo.
if 'component' in name:
name = 'delorean'
filename = name + '.repo'
filename = os.path.join(target, filename)
with open(filename, 'w') as f:
@ -187,7 +209,8 @@ def _validate_distro_repos(args):
'tripleo-ci-testing']
elif args.distro in ['centos7', 'centos8', 'rhel8']:
valid_repos = ['ceph', 'current', 'current-tripleo',
'current-tripleo-dev', 'deps', 'tripleo-ci-testing']
'current-tripleo-dev', 'deps', 'tripleo-ci-testing',
'opstools']
invalid_repos = [x for x in args.repos if x not in valid_repos]
if len(invalid_repos) > 0:
raise InvalidArguments('{} repo(s) are not valid for {}. Valid repos '
@ -237,7 +260,9 @@ def _validate_args(args):
def _remove_existing(args):
"""Remove any delorean* or opstools repos that already exist"""
pattern = re.compile('^(delorean|tripleo-centos-(opstools|ceph)).*.repo')
regex = '^(delorean|tripleo-centos-' \
'(opstools|ceph|highavailability|powertools)).*.repo'
pattern = re.compile(regex)
for f in os.listdir(args.output_path):
if pattern.match(f):
filename = os.path.join(args.output_path, f)
@ -359,6 +384,12 @@ def _install_repos(args, base_path):
_write_repo(content, args.output_path)
else:
raise InvalidArguments('Invalid repo "%s" specified' % repo)
# HA, Powertools are required for CentOS-8
if args.distro == 'centos8':
content = HIGHAVAILABILITY_REPO_TEMPLATE % args.mirror
_write_repo(content, args.output_path)
content = POWERTOOLS_REPO_TEMPLATE % args.mirror
_write_repo(content, args.output_path)
def _run_pkg_clean(distro):

7
tripleo_repos/tests/test_main.py
View File

@ -92,7 +92,8 @@ class TestTripleORepos(testtools.TestCase):
def test_remove_existing(self, mock_remove, mock_listdir):
fake_list = ['foo.repo', 'delorean.repo',
'delorean-current-tripleo.repo',
'tripleo-centos-opstools.repo']
'tripleo-centos-opstools.repo',
'tripleo-centos-highavailability.repo']
mock_listdir.return_value = fake_list
mock_args = mock.Mock()
mock_args.output_path = '/etc/yum.repos.d'
@ -105,6 +106,10 @@ class TestTripleORepos(testtools.TestCase):
self.assertIn(
mock.call('/etc/yum.repos.d/tripleo-centos-opstools.repo'),
mock_remove.mock_calls)
self.assertIn(
mock.call('/etc/yum.repos.d/'
'tripleo-centos-highavailability.repo'),
mock_remove.mock_calls)
self.assertNotIn(mock.call('/etc/yum.repos.d/foo.repo'),
mock_remove.mock_calls)