Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop removed packages from CentOS Stream 10 and RHEL 10. #696

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions bib/data/defs/centos-10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ anaconda-iso:
- fcoe-utils
- ftp
- gdb-gdbserver
- gdisk
- glibc-all-langpacks
- gnome-kiosk
- google-noto-sans-cjk-ttc-fonts
Expand All @@ -46,8 +45,6 @@ anaconda-iso:
- less
- libblockdev-lvm-dbus
- libibverbs
- libreport-plugin-bugzilla
- libreport-plugin-reportuploader
- librsvg2
- linux-firmware
- lldpad
Expand Down
28 changes: 18 additions & 10 deletions test/testcases.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,27 +52,35 @@ class TestCaseFedora42(TestCase):


@dataclasses.dataclass
class TestCaseCentos(TestCase):
class TestCaseC9S(TestCase):
container_ref: str = os.getenv(
"BIB_TEST_BOOTC_CONTAINER_TAG",
"quay.io/centos-bootc/centos-bootc:stream9")
osinfo_template: str = "CentOS Stream 9 ({arch})"


@dataclasses.dataclass
class TestCaseC10S(TestCase):
container_ref: str = os.getenv(
"BIB_TEST_BOOTC_CONTAINER_TAG",
"quay.io/centos-bootc/centos-bootc:stream10")
osinfo_template: str = "CentOS Stream 10 ({arch})"


def gen_testcases(what): # pylint: disable=too-many-return-statements
if what == "manifest":
return [TestCaseCentos(), TestCaseFedora()]
return [TestCaseC9S(), TestCaseFedora(), TestCaseC10S()]
if what == "default-rootfs":
# Fedora doesn't have a default rootfs
return [TestCaseCentos()]
return [TestCaseC9S()]
if what == "ami-boot":
return [TestCaseCentos(image="ami"), TestCaseFedora(image="ami")]
return [TestCaseC9S(image="ami"), TestCaseFedora(image="ami")]
if what == "anaconda-iso":
return [TestCaseCentos(image="anaconda-iso"), TestCaseFedora(image="anaconda-iso")]
return [TestCaseC9S(image="anaconda-iso"), TestCaseC10S(image="anaconda-iso"), TestCaseFedora(image="anaconda-iso")]
if what == "qemu-boot":
test_cases = [
klass(image=img)
for klass in (TestCaseCentos, TestCaseFedora)
for klass in (TestCaseC9S, TestCaseFedora)
for img in ("raw", "qcow2")
]
# do a cross arch test too
Expand All @@ -81,7 +89,7 @@ def gen_testcases(what): # pylint: disable=too-many-return-statements
# https://github.com/osbuild/bootc-image-builder/issues/619
# is resolved
# test_cases.append(
# TestCaseCentos(image="raw", target_arch="arm64"))
# TestCaseC9S(image="raw", target_arch="arm64"))
pass
elif platform.machine() == "arm64":
# TODO: add arm64->x86_64 cross build test too
Expand All @@ -90,21 +98,21 @@ def gen_testcases(what): # pylint: disable=too-many-return-statements
if what == "all":
return [
klass(image=img)
for klass in (TestCaseCentos, TestCaseFedora)
for klass in (TestCaseC9S, TestCaseFedora)
for img in CLOUD_BOOT_IMAGE_TYPES + DISK_IMAGE_TYPES + ["anaconda-iso"]
]
if what == "multidisk":
# single test that specifies all image types
image = "+".join(DISK_IMAGE_TYPES)
return [
TestCaseCentos(image=image),
TestCaseC9S(image=image),
TestCaseFedora(image=image),
]
# Smoke test that all supported --target-arch architecture can
# create a manifest
if what == "target-arch-smoke":
return [
TestCaseCentos(target_arch="arm64"),
TestCaseC9S(target_arch="arm64"),
# TODO: merge with TestCaseFedora once the arches are build there
TestCaseFedora42(target_arch="ppc64le"),
TestCaseFedora42(target_arch="s390x"),
Expand Down
Loading