Skip to content

Commit

Permalink
Remove CentOS 7 tests
Browse files Browse the repository at this point in the history
CentOS 7 is EOL, and using the vault URLs is somewhat impolite as they
aren't cached.

[noissue]
  • Loading branch information
pulpbot authored and dralley committed Jul 2, 2024
1 parent 542b22f commit fc643ff
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 31 deletions.
1 change: 1 addition & 0 deletions pulp_rpm/tests/functional/api/test_publish.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from pulp_smash.pulp3.utils import gen_repo, gen_distribution

from pulp_rpm.tests.functional.constants import (
EPEL8_URL,
RPM_ALT_LAYOUT_FIXTURE_URL,
RPM_COMPLEX_FIXTURE_URL,
RPM_KICKSTART_FIXTURE_URL,
Expand Down
5 changes: 3 additions & 2 deletions pulp_rpm/tests/functional/api/test_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions pulp_rpm/tests/functional/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
F36_KICKSTART_URL = "https://dl.fedoraproject.org/pub/fedora/linux/releases/36/Server/x86_64/os/"
RHEL6_KICKSTART_CDN_URL = "https://cdn.redhat.com/content/dist/rhel/server/6/6.10/x86_64/kickstart/"
Expand Down
16 changes: 3 additions & 13 deletions pulp_rpm/tests/performance/test_publish.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@
RPM_PUBLICATION_PATH,
RPM_REMOTE_PATH,
RPM_REPO_PATH,
CENTOS7_URL,
CENTOS8_STREAM_APPSTREAM_URL,
CENTOS8_STREAM_BASEOS_URL,
EPEL7_URL,
)
from pulp_rpm.tests.functional.utils import gen_rpm_remote
from pulp_rpm.tests.functional.utils import set_up_module as setUpModule # noqa:F401
Expand Down Expand Up @@ -150,13 +148,9 @@ def rpm_publish(self, url=RPM_KICKSTART_FIXTURE_URL, policy="on_demand"):
)
return publish_task["created_resources"][0]

def test_epel7(self):
"""Publish EPEL 7."""
self.rpm_publish(url=EPEL7_URL)

def test_centos7(self):
"""Publish CentOS 7."""
self.rpm_publish(url=CENTOS7_URL)
def test_epel8(self):
"""Publish EPEL 8."""
self.rpm_publish(url=EPEL8_URL)

def test_centos_8stream_baseos(self):
"""Publish CentOS 8 BaseOS."""
Expand Down Expand Up @@ -195,7 +189,3 @@ def test_centos_8stream_baseos(self):
def test_centos8_appstream(self):
"""Publish CentOS 8 AppStream."""
self.rpm_publish(url=CENTOS8_STREAM_APPSTREAM_URL)

def test_centos8_baseos(self):
"""Publish CentOS 8 BaseOS."""
self.rpm_publish(url=CENTOS8_STREAM_BASEOS_URL)
5 changes: 0 additions & 5 deletions pulp_rpm/tests/performance/test_pulp_to_pulp.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
)

from pulp_rpm.tests.functional.constants import (
CENTOS7_URL,
CENTOS8_STREAM_BASEOS_URL,
CENTOS8_STREAM_APPSTREAM_URL,
)
Expand Down Expand Up @@ -128,10 +127,6 @@ def do_test(self, url, policy="on_demand"):
added2 = get_added_content_summary(repo2.to_dict())
self.assertDictEqual(added, added2)

def test_centos7_on_demand(self):
"""Sync CentOS 7."""
self.do_test(url=CENTOS7_URL)

def test_centos8_baseos_on_demand(self):
"""Sync CentOS 8 BaseOS."""
self.do_test(url=CENTOS8_STREAM_BASEOS_URL)
Expand Down
11 changes: 3 additions & 8 deletions pulp_rpm/tests/performance/test_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
RPM_KICKSTART_FIXTURE_URL,
RPM_REMOTE_PATH,
RPM_REPO_PATH,
CENTOS7_URL,
CENTOS8_STREAM_APPSTREAM_URL,
CENTOS8_STREAM_BASEOS_URL,
EPEL8_MIRRORLIST_URL,
Expand Down Expand Up @@ -143,14 +142,10 @@ def rpm_sync(
# Check that nothing has changed since the last sync.
self.assertEqual(latest_version_href, repo["latest_version_href"])

def test_centos7_on_demand(self):
"""Sync CentOS 7."""
self.rpm_sync(url=CENTOS7_URL)

@unittest.skip("Skip to avoid failing due to running out of disk space")
def test_centos7_immediate(self):
"""Sync CentOS 7 with the immediate policy."""
self.rpm_sync(url=CENTOS7_URL, policy="immediate")
def test_centos8_baseos_immediate(self):
"""Sync CentOS 8 Stream with the immediate policy."""
self.rpm_sync(url=CENTOS8_STREAM_BASEOS_URL, policy="immediate")

def test_centos8_baseos_on_demand(self):
"""Sync CentOS 8 BaseOS."""
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
version="3.19.13.dev",
description="RPM plugin for the Pulp Project",
long_description=long_description,
long_description_content_type="text/x-rst",
license="GPLv2+",
author="Pulp Project Developers",
author_email="pulp-list@redhat.com",
Expand Down

0 comments on commit fc643ff

Please sign in to comment.