From e4558c5d0e34a48225f223484b3643c368b11679 Mon Sep 17 00:00:00 2001 From: Daniel Alley Date: Mon, 1 Jul 2024 16:06:03 -0400 Subject: [PATCH] Remove CentOS 7 tests CentOS 7 is EOL, and using the vault URLs is somewhat impolite as they aren't cached. [noissue] (cherry picked from commit 99d657d53153fc698c64bfb3d35c558574438092) --- pulp_rpm/tests/functional/api/test_sync.py | 5 +++-- pulp_rpm/tests/functional/constants.py | 4 +--- pulp_rpm/tests/performance/test_publish.py | 4 ---- pulp_rpm/tests/performance/test_pulp_to_pulp.py | 5 +---- pulp_rpm/tests/performance/test_sync.py | 4 +--- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/pulp_rpm/tests/functional/api/test_sync.py b/pulp_rpm/tests/functional/api/test_sync.py index 400231b7f..99a357be4 100644 --- a/pulp_rpm/tests/functional/api/test_sync.py +++ b/pulp_rpm/tests/functional/api/test_sync.py @@ -20,7 +20,6 @@ from pulp_rpm.tests.functional.constants import ( AMAZON_MIRROR, - CENTOS7_OPSTOOLS_URL, PULP_TYPE_ADVISORY, PULP_TYPE_MODULEMD, PULP_TYPE_PACKAGE, @@ -741,13 +740,15 @@ def test_sha_checksum(init_and_sync): init_and_sync(url=RPM_SHA_FIXTURE_URL) +@pytest.mark.skip("TODO: Need a new test fixture") @pytest.mark.parallel def test_one_nevra_two_locations_and_checksums(init_and_sync): """Sync a repository known to have one nevra, in two locations, with different content. While 'odd', this is a real-world occurrence. """ - init_and_sync(url=CENTOS7_OPSTOOLS_URL, policy="on_demand") + # init_and_sync(url=CENTOS7_OPSTOOLS_URL, policy="on_demand") + pass @pytest.mark.parallel diff --git a/pulp_rpm/tests/functional/constants.py b/pulp_rpm/tests/functional/constants.py index e43194320..c784d4354 100644 --- a/pulp_rpm/tests/functional/constants.py +++ b/pulp_rpm/tests/functional/constants.py @@ -604,13 +604,11 @@ RPM_ONLY_METADATA_REPO_URL = urljoin(PULP_FIXTURES_BASE_URL, "rpm-unsigned-meta-only") AMAZON_MIRROR = "http://amazonlinux.us-east-1.amazonaws.com/2/core/latest/x86_64/mirror.list" -CENTOS7_URL = "http://mirror.centos.org/centos-7/7/os/x86_64/" -CENTOS7_OPSTOOLS_URL = "http://mirror.centos.org/centos/7/opstools/x86_64/" CENTOS8_STREAM_BASEOS_URL = "http://vault.centos.org/centos/8-stream/BaseOS/x86_64/os/" CENTOS8_STREAM_APPSTREAM_URL = "http://vault.centos.org/centos/8-stream/AppStream/x86_64/os/" CENTOS9_STREAM_BASEOS_URL = "http://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/" CENTOS9_STREAM_APPSTREAM_URL = "http://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/" -EPEL7_URL = "https://dl.fedoraproject.org/pub/epel/7/x86_64/" +EPEL8_URL = "https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/" EPEL8_MIRRORLIST_URL = "https://mirrors.fedoraproject.org/mirrorlist?repo=epel-8&arch=x86_64" RAWHIDE_KICKSTART_URL = ( "https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Server/x86_64/os/" diff --git a/pulp_rpm/tests/performance/test_publish.py b/pulp_rpm/tests/performance/test_publish.py index 992efd828..0389fd084 100644 --- a/pulp_rpm/tests/performance/test_publish.py +++ b/pulp_rpm/tests/performance/test_publish.py @@ -11,10 +11,8 @@ from pulp_rpm.tests.functional.constants import ( RPM_PACKAGE_CONTENT_NAME, - CENTOS7_URL, CENTOS8_STREAM_APPSTREAM_URL, CENTOS8_STREAM_BASEOS_URL, - EPEL7_URL, ) @@ -83,8 +81,6 @@ def _extra_test(publication_href): @pytest.mark.parametrize( "url,extra_tests", [ - (EPEL7_URL, None), - (CENTOS7_URL, None), (CENTOS8_STREAM_BASEOS_URL, "centos_8stream_baseos_extra_tests"), (CENTOS8_STREAM_APPSTREAM_URL, None), (CENTOS8_STREAM_BASEOS_URL, None), diff --git a/pulp_rpm/tests/performance/test_pulp_to_pulp.py b/pulp_rpm/tests/performance/test_pulp_to_pulp.py index fcebf0413..215309472 100644 --- a/pulp_rpm/tests/performance/test_pulp_to_pulp.py +++ b/pulp_rpm/tests/performance/test_pulp_to_pulp.py @@ -3,16 +3,13 @@ import pytest from pulp_rpm.tests.functional.constants import ( - CENTOS7_URL, CENTOS8_STREAM_BASEOS_URL, CENTOS8_STREAM_APPSTREAM_URL, ) @pytest.mark.parallel -@pytest.mark.parametrize( - "url", [CENTOS7_URL, CENTOS8_STREAM_BASEOS_URL, CENTOS8_STREAM_APPSTREAM_URL] -) +@pytest.mark.parametrize("url", [CENTOS8_STREAM_BASEOS_URL, CENTOS8_STREAM_APPSTREAM_URL]) def test_pulp_to_pulp( url, init_and_sync, diff --git a/pulp_rpm/tests/performance/test_sync.py b/pulp_rpm/tests/performance/test_sync.py index e5b72123e..e41b0c221 100644 --- a/pulp_rpm/tests/performance/test_sync.py +++ b/pulp_rpm/tests/performance/test_sync.py @@ -10,7 +10,6 @@ RHEL8_BASEOS_CDN_URL, RPM_KICKSTART_CONTENT_NAME, RPM_KICKSTART_COUNT, - CENTOS7_URL, CENTOS8_STREAM_APPSTREAM_URL, CENTOS8_STREAM_BASEOS_URL, EPEL8_MIRRORLIST_URL, @@ -34,9 +33,8 @@ def parse_date_from_string(s, parse_format="%Y-%m-%dT%H:%M:%S.%fZ"): @pytest.mark.parametrize( "url,policy,check_dist_tree,resync", [ - (CENTOS7_URL, "on_demand", True, True), pytest.param( - CENTOS7_URL, + CENTOS8_STREAM_BASEOS_URL, "immediate", True, True,