diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-03-09 17:44:54 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-04-15 09:32:06 +0000 |
| commit | 53443c5c712f4ec23b859105e94bcd90abc27762 (patch) | |
| tree | 5bc6d8db4c65519e16d231b55f574e813e29da4b /kolla/tests/test_methods.py | |
| parent | a176c6e080be2e71829e8ca5e8b330fdda70038a (diff) | |
| download | kolla-53443c5c712f4ec23b859105e94bcd90abc27762.tar.gz kolla-53443c5c712f4ec23b859105e94bcd90abc27762.zip | |
Remove support for CentOS 7
With the move to RHEL/CentOS 8 we no longer have Python 2 in our images
so there is no need for checking which Python version (2.x or 3.x) is
used inside of containers.
We also no longer have to support yum as a value for
distro_package_manager.
Partially-Implements: blueprint centos-rhel-8
Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9
Diffstat (limited to 'kolla/tests/test_methods.py')
| -rw-r--r-- | kolla/tests/test_methods.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index c33aba7f9..d2f6ac283 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -27,7 +27,6 @@ class MethodsTest(base.TestCase): 'base_arch': 'x86_64', 'base_distro': 'rhel', 'base_package_type': 'rpm', - 'distro_package_manager': 'yum' } result = methods.handle_repos(template_vars, ['grafana'], 'enable') @@ -39,11 +38,10 @@ class MethodsTest(base.TestCase): 'base_arch': 'x86_64', 'base_distro': 'centos', 'base_package_type': 'rpm', - 'distro_package_manager': 'yum' } result = methods.handle_repos(template_vars, ['grafana'], 'enable') - expectCmd = 'RUN yum-config-manager --enable grafana' + expectCmd = 'RUN dnf config-manager --enable grafana || true' self.assertEqual(expectCmd, result) def test_enable_repos_centos_missing_repo(self): @@ -51,7 +49,6 @@ class MethodsTest(base.TestCase): 'base_arch': 'x86_64', 'base_distro': 'centos', 'base_package_type': 'rpm', - 'distro_package_manager': 'yum' } result = methods.handle_repos(template_vars, ['missing_repo'], @@ -64,13 +61,12 @@ class MethodsTest(base.TestCase): 'base_arch': 'x86_64', 'base_distro': 'centos', 'base_package_type': 'rpm', - 'distro_package_manager': 'yum' } result = methods.handle_repos(template_vars, ['grafana', 'ceph'], 'enable') - expectCmd = 'RUN yum-config-manager --enable grafana ' - expectCmd += '--enable centos-ceph-nautilus' + expectCmd = 'RUN dnf config-manager --enable grafana ' + expectCmd += '--enable centos-ceph-nautilus || true' self.assertEqual(expectCmd, result) def test_enable_repos_debian(self): @@ -118,11 +114,10 @@ class MethodsTest(base.TestCase): 'base_arch': 'x86_64', 'base_distro': 'centos', 'base_package_type': 'rpm', - 'distro_package_manager': 'yum' } result = methods.handle_repos(template_vars, ['grafana'], 'disable') - expectCmd = 'RUN yum-config-manager --disable grafana' + expectCmd = 'RUN dnf config-manager --disable grafana || true' self.assertEqual(expectCmd, result) def test_disable_repos_centos_multiple(self): @@ -130,13 +125,12 @@ class MethodsTest(base.TestCase): 'base_arch': 'x86_64', 'base_distro': 'centos', 'base_package_type': 'rpm', - 'distro_package_manager': 'yum' } result = methods.handle_repos(template_vars, ['grafana', 'ceph'], 'disable') - expectCmd = 'RUN yum-config-manager --disable grafana ' - expectCmd += '--disable centos-ceph-nautilus' + expectCmd = 'RUN dnf config-manager --disable grafana ' + expectCmd += '--disable centos-ceph-nautilus || true' self.assertEqual(expectCmd, result) # NOTE(hrw): there is no disabling of repos for Debian/Ubuntu |