[RHELC-858] Remove configs for RHEL6 (#699)

oamg · Jan 11, 2023 · 881af68 · 881af68
1 parent 62a3981
commit 881af68
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 168 deletions.
diff --git a/convert2rhel/data/6/x86_64/configs/centos-6-x86_64.cfg b/convert2rhel/data/6/x86_64/configs/centos-6-x86_64.cfg
diff --git a/convert2rhel/data/6/x86_64/configs/oracle-6-x86_64.cfg b/convert2rhel/data/6/x86_64/configs/oracle-6-x86_64.cfg
diff --git a/convert2rhel/data/6/x86_64/configs/suse_es-6-x86_64.cfg b/convert2rhel/data/6/x86_64/configs/suse_es-6-x86_64.cfg
diff --git a/convert2rhel/data/6/x86_64/rhel-certs/69.pem b/convert2rhel/data/6/x86_64/rhel-certs/69.pem
diff --git a/convert2rhel/systeminfo.py b/convert2rhel/systeminfo.py
@@ -46,7 +46,6 @@
     "8.5": "8.5",
     "8.4": "8.4",
     "7.9": "7Server",
-    "6.10": "6Server",
 }
 
 # For a list of modified rpm files before the conversion starts

diff --git a/convert2rhel/unit_tests/cert_test.py b/convert2rhel/unit_tests/cert_test.py
@@ -88,10 +88,9 @@ def test_get_cert_path_missing_cert(message, caplog, cert_dir):
 @pytest.mark.parametrize(
     ("arch", "rhel_version", "pem"),
     (
-        ("x86_64", "6", "69.pem"),
+        ("ppc64", "7", "74.pem"),
         ("x86_64", "7", "69.pem"),
         ("x86_64", "8", "479.pem"),
-        ("ppc64", "7", "74.pem"),
     ),
 )
 def test_get_cert_path(arch, rhel_version, pem, monkeypatch):
@@ -105,7 +104,7 @@ def test_get_cert_path(arch, rhel_version, pem, monkeypatch):
 
 def test_install_cert(monkeypatch, tmpdir):
     monkeypatch.setattr(tool_opts, "arch", "x86_64")
-    monkeypatch.setattr(utils, "DATA_DIR", os.path.join(BASE_DATA_DIR, "6", "x86_64"))
+    monkeypatch.setattr(utils, "DATA_DIR", os.path.join(BASE_DATA_DIR, "7", "x86_64"))
 
     # By initializing the cert object we get a path to an existing
     # certificate based on the mocked parameters above

diff --git a/convert2rhel/unit_tests/conftest.py b/convert2rhel/unit_tests/conftest.py
@@ -288,20 +288,13 @@ def pretend_os(request, pkg_root, monkeypatch):
 all_systems = pytest.mark.parametrize(
     "pretend_os",
     (
-        ("6.10.1111", "CentOS Linux"),
-        ("6.10.1111", "Oracle Linux Server"),
         ("7.9.1111", "CentOS Linux"),
         ("7.9.1111", "Oracle Linux Server"),
         ("8.4.1111", "CentOS Linux"),
         ("8.4.1111", "Oracle Linux Server"),
     ),
     indirect=True,
 )
-centos6 = pytest.mark.parametrize(
-    "pretend_os",
-    (("6.10.1111", "CentOS Linux"),),
-    indirect=True,
-)
 centos7 = pytest.mark.parametrize(
     "pretend_os",
     (("7.9.1111", "CentOS Linux"),),