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 deleted file mode 100644 index 7a6789a2b1..0000000000 --- a/convert2rhel/data/6/x86_64/configs/centos-6-x86_64.cfg +++ /dev/null @@ -1,39 +0,0 @@ -[system_info] - -# Fingerprints of GPG keys used for signing packages of the OS to be converted. -# The GPG keys are available at https://www.centos.org/keys/ -# Delimited by whitespace(s). -gpg_fingerprints = 0946fca2c105b9de - -# List of packages to be removed before the system conversion starts. -# Delimited by any whitespace(s). -excluded_pkgs = - centos-bookmarks - centos-logos - centos-indexhtml - libreport-centos - libreport-plugin-mantisbt - rhnlib - yum-rhn-plugin - -# List of packages that either contain repofiles or affect variables in the repofiles (e.g. $releasever). -# Delimited by any whitespace(s). -repofile_pkgs = - centos-release - -# List of repoids to enable through subscription-manager when the --enablerepo option is not used. -# Delimited by any whitespace(s). -default_rhsm_repoids = rhel-6-server-rpms - -# List of Extended Update Support (EUS) repoids to enable through subscription-manager when the --enablerepo option is -# not used. Delimited by any whitespace(s). -eus_rhsm_repoids = - -# If defined, it overrides the default releasever defined by RELEASE_VER_MAPPING. -# The value is passed to the yum calls through the --releasever option when accessing RHEL repos. Its purpose is to -# substitute the $releasever variable in a repository baseurl. -releasever= - -# Some kernel modules move from kernel modules to kernel core. Instead of inhibiting the conversion with a message -# that such a module is not available in RHEL and thus is unsupported, we ignore it. -kmods_to_ignore = 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 deleted file mode 100644 index 6b08018cd1..0000000000 --- a/convert2rhel/data/6/x86_64/configs/oracle-6-x86_64.cfg +++ /dev/null @@ -1,51 +0,0 @@ -[system_info] - -# Fingerprints of GPG keys used for signing packages of the OS to be converted. -# The GPG key is available at: -# http://public-yum.oracle.com/RPM-GPG-KEY-oracle-ol6 -# Delimited by whitespace(s). -gpg_fingerprints = 72f97b74ec551f03 - -# List of packages to be removed before the system conversion starts. -# Delimited by any whitespace(s). -excluded_pkgs = - oracle-logos - yum-plugin-ulninfo - linux-firmware - oracleasm-support - oracle-rdbms-server-* - btrfs-progs-devel - oraclelinux-release-notes - yum-rhn-plugin - rhn-check - rhn-setup - rhn-setup-gnome - rhnlib - rhnsd - -# List of packages that either contain repofiles or affect variables in the repofiles (e.g. $releasever). -# Delimited by any whitespace(s). -repofile_pkgs = - rhn-client-tools - oraclelinux-release-el6 - oraclelinux-developer-release-el6 - oracle-release-el6 - oraclelinux-release - redhat-release* - -# List of repoids to enable through subscription-manager when the --enablerepo option is not used. -# Delimited by any whitespace(s). -default_rhsm_repoids = rhel-6-server-rpms - -# List of Extended Update Support (EUS) repoids to enable through subscription-manager when the --enablerepo option is -# not used. Delimited by any whitespace(s). -eus_rhsm_repoids = - -# If defined, it overrides the default releasever defined by RELEASE_VER_MAPPING. -# The value is passed to the yum calls through the --releasever option when accessing RHEL repos. Its purpose is to -# substitute the $releasever variable in a repository baseurl. -releasever= - -# Some kernel modules move from kernel modules to kernel core. Instead of inhibiting the conversion with a message -# that such a module is not available in RHEL and thus is unsupported, we ignore it. -kmods_to_ignore = 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 deleted file mode 100644 index 63af916d90..0000000000 --- a/convert2rhel/data/6/x86_64/configs/suse_es-6-x86_64.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[system_info] - -# SUSE ES packages are not signed -gpg_fingerprints = - -# List of packages to be removed before the system conversion starts. -# Delimited by any whitespace(s). -excluded_pkgs = - sles_es-indexhtml - suseRegisterInfo - suseRegisterRES - -# List of packages that either contain repofiles or affect variables in the repofiles (e.g. $releasever). -# Delimited by any whitespace(s). -repofile_pkgs = - -# List of repoids to enable through subscription-manager when the --enablerepo option is not used. -# Delimited by any whitespace(s). -default_rhsm_repoids = rhel-6-server-rpms - -# List of Extended Update Support (EUS) repoids to enable through subscription-manager when the --enablerepo option is -# not used. Delimited by any whitespace(s). -eus_rhsm_repoids = - -# If defined, it overrides the default releasever defined by RELEASE_VER_MAPPING. -# The value is passed to the yum calls through the --releasever option when accessing RHEL repos. Its purpose is to -# substitute the $releasever variable in a repository baseurl. -releasever= - -# Some kernel modules move from kernel modules to kernel core. Instead of inhibiting the conversion with a message -# that such a module is not available in RHEL and thus is unsupported, we ignore it. -kmods_to_ignore = diff --git a/convert2rhel/data/6/x86_64/rhel-certs/69.pem b/convert2rhel/data/6/x86_64/rhel-certs/69.pem deleted file mode 100644 index d569394745..0000000000 --- a/convert2rhel/data/6/x86_64/rhel-certs/69.pem +++ /dev/null @@ -1,35 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIGDTCCA/WgAwIBAgIJALDxRLt/tU/zMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD -VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExFjAUBgNVBAoMDVJlZCBI -YXQsIEluYy4xGDAWBgNVBAsMD1JlZCBIYXQgTmV0d29yazEuMCwGA1UEAwwlUmVk -IEhhdCBFbnRpdGxlbWVudCBQcm9kdWN0IEF1dGhvcml0eTEkMCIGCSqGSIb3DQEJ -ARYVY2Etc3VwcG9ydEByZWRoYXQuY29tMB4XDTE2MDMxNzIwMzEwOVoXDTM2MDMx -MjIwMzEwOVowRDFCMEAGA1UEAww5UmVkIEhhdCBQcm9kdWN0IElEIFswNjY0MTEz -MC0wNzM2LTQ4NGMtYmNkZC1kYmNkZTk4YWMxMGFdMIICIjANBgkqhkiG9w0BAQEF -AAOCAg8AMIICCgKCAgEAxj9J04z+Ezdyx1U33kFftLv0ntNS1BSeuhoZLDhs18yk -sepG7hXXtHh2CMFfLZmTjAyL9i1XsxykQpVQdXTGpUF33C2qBQHB5glYs9+d781x -8p8m8zFxbPcW82TIJXbgW3ErVh8vk5qCbG1cCAAHb+DWMq0EAyy1bl/JgAghYNGB -RvKJObTdCrdpYh02KUqBLkSPZHvo6DUJFN37MXDpVeQq9VtqRjpKLLwuEfXb0Y7I -5xEOrR3kYbOaBAWVt3mYZ1t0L/KfY2jVOdU5WFyyB9PhbMdLi1xE801j+GJrwcLa -xmqvj4UaICRzcPATP86zVM1BBQa+lilkRQes5HyjZzZDiGYudnXhbqmLo/n0cuXo -QBVVjhzRTMx71Eiiahmiw+U1vGqkHhQNxb13HtN1lcAhUCDrxxeMvrAjYdWpYlpI -yW3NssPWt1YUHidMBSAJ4KctIf91dyE93aStlxwC/QnyFsZOmcEsBzVCnz9GmWMl -1/6XzBS1yDUqByklx0TLH+z/sK9A+O2rZAy1mByCYwVxvbOZhnqGxAuToIS+A81v -5hCjsCiOScVB+cil30YBu0cH85RZ0ILNkHdKdrLLWW4wjphK2nBn2g2i3+ztf+nQ -ED2pQqZ/rhuW79jcyCZl9kXqe1wOdF0Cwah4N6/3LzIXEEKyEJxNqQwtNc2IVE8C -AwEAAaOBljCBkzAJBgNVHRMEAjAAMDAGCysGAQQBkggJAUUBBCEMH1JlZCBIYXQg -RW50ZXJwcmlzZSBMaW51eCBTZXJ2ZXIwFAYLKwYBBAGSCAkBRQIEBQwDNi44MBcG -CysGAQQBkggJAUUDBAgMBng4Nl82NDAlBgsrBgEEAZIICQFFBAQWDBRyaGVsLTYs -cmhlbC02LXNlcnZlcjANBgkqhkiG9w0BAQUFAAOCAgEAkmwyb55mtjLpXrG/djUP -Ux1e4AGBpmZ4Tw/RkHOu5wFfX8M4GstThoaiDgBtd0G1DCgeGDufRVVBluWkEIdE -4YC/KEaXDu6tZ+/ulL9gAufooGSJovpSZJDScuJY5NozYlydtJkLZDKHM8GUmRqO -D8RDU5wCTy8Em0uGweUWq/MC5pMZsYlw2fGgfpPap/j/LurKa1TBm+az0+a1iHFF -Ls61K9EbdrtcXe2Cp8sYhWUPQn9IBJhgi079NS7xfAvuOlk0vuM8b8RvkXAVMdjE -EMJRqwrhyeicIzt8roK/beADfH7RM314MjKB10ot4oR0JVX+f9EE4aGDTwZFrh2d -qTFkQKNfKBx2wWEfNGOwU5uiNYlTuxhiDoVximVmCaLIaqPJtseAcyXC4YhBiC0u -1XaCWaePn1FI25BGNe4y5/BYc+hPfArMEFmDQWXVFvZ3Qx2bFju0AE387KxvROd+ -nVsx8b8WzyHnOvF0b6XnAbA2XDuymbb9FoEdgU00bEa6v7BbFOKNNlIwB4m5fTIC -C/jyZBxu5Rg48PB3dghkaw9C7rAW039f7uIg1YeCoh2g704VibIBI29Xc8W4XDIN -xF2tTJSpYRzmwFFda50RcJgYmddHPc+n1yvu8Ptg/yhdghbRsWLtxOOwR6K4+VFp -YlUJiCvEei7xX/qSPtyti68= ------END CERTIFICATE----- diff --git a/convert2rhel/systeminfo.py b/convert2rhel/systeminfo.py index f5ce84900c..f6386ab4ad 100644 --- 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 index 17e3df8e09..3b583a2b04 100644 --- 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 index 2e39774793..d3faf8796b 100644 --- a/convert2rhel/unit_tests/conftest.py +++ b/convert2rhel/unit_tests/conftest.py @@ -288,8 +288,6 @@ 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"), @@ -297,11 +295,6 @@ def pretend_os(request, pkg_root, monkeypatch): ), 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"),),