Skip to content

Commit

Permalink
Switch package manager tests from diffutils to another package (#3454)
Browse files Browse the repository at this point in the history 
diffutils now cannot be removed from coreos images, therefore we are
picking another packages to be used for package manager units tests. Not
in all cases, some images are not affected.
  • Loading branch information
@happz
happz authored Jan 8, 2025
1 parent 9126daa commit 0bf5b80
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 52 deletions.
17 changes: 1 addition & 16 deletions containers/fedora/coreos/Containerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,4 @@ FROM quay.io/fedora/fedora-coreos:stable
# manager implementation
RUN rpm-ostree install dnf5 \
# Populate dnf cache
&& dnf5 makecache \
# Remove diffutils as its used in many package manager tests, and tests
# are simpler if all environments lack the same package, we don't have
# to parametrize them even more.
# Do *NOT* use dnf5 to remove this package - it might create conflicts
# in /var/lib/dnf should the next command called be `debuginfo-install`
# or any other dnf4-ish command.
&& rpm-ostree uninstall diffutils \
# Removing diffutils, these need to be removed too.
bootc \
containers-common-extra \
passt \
passt-selinux \
podman \
policycoreutils \
toolbox
&& dnf5 makecache
15 changes: 0 additions & 15 deletions containers/fedora/coreos/ostree/Containerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,5 @@ FROM quay.io/fedora/fedora-coreos:stable
RUN rpm-ostree install dnf5 \
# Populate dnf cache
&& dnf5 makecache \
# Remove diffutils as its used in many package manager tests, and tests
# are simpler if all environments lack the same package, we don't have
# to parametrize them even more.
# Do *NOT* use dnf5 to remove this package - it might create conflicts
# in /var/lib/dnf should the next command called be `debuginfo-install`
# or any other dnf4-ish command.
&& rpm-ostree uninstall diffutils \
# Removing diffutils, these need to be removed too.
bootc \
containers-common-extra \
passt \
passt-selinux \
podman \
policycoreutils \
toolbox \
# Simulate ostree-booted environment
&& touch /run/ostree-booted
84 changes: 63 additions & 21 deletions tests/unit/test_package_managers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1419,13 +1419,20 @@ def _parametrize_test_install_multiple() -> \
r"rpm -q --whatprovides dconf libpng \|\| yum install -y dconf libpng && rpm -q --whatprovides dconf libpng", \
'Complete!' # noqa: E501

else:
elif 'centos' in container.url:
yield container, \
package_manager_class, \
(Package('tree'), Package('diffutils')), \
r"rpm -q --whatprovides tree diffutils \|\| yum install -y tree diffutils && rpm -q --whatprovides tree diffutils", \
'Complete!' # noqa: E501

else:
yield container, \
package_manager_class, \
(Package('tree'), Package('nano')), \
r"rpm -q --whatprovides tree nano \|\| yum install -y tree nano && rpm -q --whatprovides tree nano", \
'Complete!' # noqa: E501

elif package_manager_class is tmt.package_managers.dnf.Dnf:
if 'ubi/8' in container.url:
yield container, \
Expand All @@ -1434,32 +1441,39 @@ def _parametrize_test_install_multiple() -> \
r"rpm -q --whatprovides dconf libpng \|\| dnf install -y dconf libpng", \
'Complete!'

else:
elif 'centos' in container.url:
yield container, \
package_manager_class, \
(Package('tree'), Package('diffutils')), \
r"rpm -q --whatprovides tree diffutils \|\| dnf install -y tree diffutils", \
'Complete!'

else:
yield container, \
package_manager_class, \
(Package('tree'), Package('nano')), \
r"rpm -q --whatprovides tree nano \|\| dnf install -y tree nano", \
'Complete!'

elif package_manager_class is tmt.package_managers.dnf.Dnf5:
yield container, \
package_manager_class, \
(Package('tree'), Package('diffutils')), \
r"rpm -q --whatprovides tree diffutils \|\| dnf5 install -y tree diffutils", \
(Package('tree'), Package('nano')), \
r"rpm -q --whatprovides tree nano \|\| dnf5 install -y tree nano", \
None

elif package_manager_class is tmt.package_managers.apt.Apt:
yield container, \
package_manager_class, \
(Package('tree'), Package('diffutils')), \
r"export DEBIAN_FRONTEND=noninteractive; dpkg-query --show tree diffutils \|\| apt install -y tree diffutils", \
(Package('tree'), Package('nano')), \
r"export DEBIAN_FRONTEND=noninteractive; dpkg-query --show tree nano \|\| apt install -y tree nano", \
'Setting up tree' # noqa: E501

elif package_manager_class is tmt.package_managers.rpm_ostree.RpmOstree:
yield container, \
package_manager_class, \
(Package('tree'), Package('diffutils')), \
r"rpm -q --whatprovides tree diffutils \|\| rpm-ostree install --apply-live --idempotent --allow-inactive tree diffutils", \
(Package('tree'), Package('nano')), \
r"rpm -q --whatprovides tree nano \|\| rpm-ostree install --apply-live --idempotent --allow-inactive tree nano", \
'Installing: tree' # noqa: E501

elif package_manager_class is tmt.package_managers.apk.Apk:
Expand Down Expand Up @@ -1510,6 +1524,7 @@ def _parametrize_test_install_downloaded() -> \
Container,
PackageManagerClass,
tuple[Package, Package],
tuple[str, str],
str,
Optional[str]]]:

Expand All @@ -1519,8 +1534,9 @@ def _parametrize_test_install_downloaded() -> \
yield pytest.param(
container,
package_manager_class,
(Package('tree'), Package('diffutils')),
r"yum install -y --skip-broken /tmp/tree.rpm /tmp/diffutils.rpm \|\| /bin/true", # noqa: E501
(Package('tree'), Package('nano')),
('tree*.x86_64.rpm', 'nano*.x86_64.rpm'),
r"yum install -y --skip-broken /tmp/tree.rpm /tmp/nano.rpm \|\| /bin/true",
'Complete!',
marks=pytest.mark.skip(reason="CentOS 7 does not support 'download' command")
)
Expand All @@ -1529,51 +1545,74 @@ def _parametrize_test_install_downloaded() -> \
yield container, \
package_manager_class, \
(Package('dconf'), Package('libpng')), \
('dconf*.x86_64.rpm', 'libpng*.x86_64.rpm'), \
r"yum install -y --skip-broken /tmp/dconf.rpm /tmp/libpng.rpm \|\| /bin/true", \
'Complete!' # noqa: E501

else:
elif 'centos' in container.url:
yield container, \
package_manager_class, \
(Package('tree'), Package('diffutils')), \
('tree*.x86_64.rpm', 'diffutils*.x86_64.rpm'), \
r"yum install -y --skip-broken /tmp/tree.rpm /tmp/diffutils.rpm \|\| /bin/true", \
'Complete!' # noqa: E501

else:
yield container, \
package_manager_class, \
(Package('tree'), Package('nano')), \
('tree*.x86_64.rpm', 'nano*.x86_64.rpm'), \
r"yum install -y --skip-broken /tmp/tree.rpm /tmp/nano.rpm \|\| /bin/true", \
'Complete!'

elif package_manager_class is tmt.package_managers.dnf.Dnf:
if 'ubi/8' in container.url:
yield container, \
package_manager_class, \
(Package('dconf'), Package('libpng')), \
('dconf*.x86_64.rpm', 'libpng*.x86_64.rpm'), \
r"dnf install -y /tmp/dconf.rpm /tmp/libpng.rpm", \
'Complete!'

else:
elif 'centos/stream9' in container.url:
yield container, \
package_manager_class, \
(Package('tree'), Package('diffutils')), \
('tree*.x86_64.rpm', 'diffutils*.x86_64.rpm'), \
r"dnf install -y /tmp/tree.rpm /tmp/diffutils.rpm", \
'Complete!'

else:
yield container, \
package_manager_class, \
(Package('tree'), Package('nano')), \
('tree*.x86_64.rpm', 'nano*.x86_64.rpm'), \
r"dnf install -y /tmp/tree.rpm /tmp/nano.rpm", \
'Complete!'

elif package_manager_class is tmt.package_managers.dnf.Dnf5:
yield container, \
package_manager_class, \
(Package('tree'), Package('diffutils')), \
r"dnf5 install -y /tmp/tree.rpm /tmp/diffutils.rpm", \
(Package('tree'), Package('nano')), \
('tree*.x86_64.rpm', 'nano*.x86_64.rpm'), \
r"dnf5 install -y /tmp/tree.rpm /tmp/nano.rpm", \
None

elif package_manager_class is tmt.package_managers.rpm_ostree.RpmOstree:
yield container, \
package_manager_class, \
(Package('tree'), Package('diffutils')), \
r"rpm-ostree install --apply-live --idempotent --allow-inactive /tmp/tree.rpm /tmp/diffutils.rpm", \
(Package('tree'), Package('cowsay')), \
('tree*.x86_64.rpm', 'cowsay*.noarch.rpm'), \
r"rpm-ostree install --apply-live --idempotent --allow-inactive /tmp/tree.rpm /tmp/cowsay.rpm", \
'Installing: tree' # noqa: E501

elif package_manager_class is tmt.package_managers.apt.Apt:
yield pytest.param(
container,
package_manager_class,
(Package('tree'), Package('diffutils')),
r"export DEBIAN_FRONTEND=noninteractive; dpkg-query --show tree diffutils \|\| apt install -y tree diffutils", # noqa: E501
(Package('tree'), Package('nano')),
('tree*.x86_64.rpm', 'nano*.x86_64.rpm'),
r"export DEBIAN_FRONTEND=noninteractive; dpkg-query --show tree nano \|\| apt install -y tree nano", # noqa: E501
'Setting up tree',
marks=pytest.mark.skip(reason="not supported yet")
)
Expand All @@ -1582,8 +1621,9 @@ def _parametrize_test_install_downloaded() -> \
yield pytest.param(
container,
package_manager_class,
(Package('tree'), Package('diffutils')),
r"apk info -e tree diffutils \|\| apk add tree diffutils",
(Package('tree'), Package('nano')),
('tree*.x86_64.rpm', 'nano*.x86_64.rpm'),
r"apk info -e tree nano \|\| apk add tree nano",
'Installing tree',
marks=pytest.mark.skip(reason="not supported yet")
)
Expand All @@ -1596,6 +1636,7 @@ def _parametrize_test_install_downloaded() -> \
@pytest.mark.parametrize(('container_per_test',
'package_manager_class',
'packages',
'artifacts',
'expected_command',
'expected_output'),
list(_parametrize_test_install_downloaded()),
Expand All @@ -1606,6 +1647,7 @@ def test_install_downloaded(
guest_per_test: GuestContainer,
package_manager_class: PackageManagerClass,
packages: tuple[Package, Package],
artifacts: tuple[str, str],
expected_command: str,
expected_output: Optional[str],
root_logger: tmt.log.Logger,
Expand All @@ -1624,7 +1666,7 @@ def test_install_downloaded(
(yum download --destdir /tmp {packages[0]} {packages[1]} \
|| (dnf install -y 'dnf-command(download)' && dnf download --destdir /tmp {packages[0]} {packages[1]}) \
|| (dnf5 install -y 'dnf-command(download)' && dnf5 download --destdir /tmp {packages[0]} {packages[1]})) \
&& mv /tmp/{packages[0]}*.x86_64.rpm /tmp/{packages[0]}.rpm && mv /tmp/{packages[1]}*.x86_64.rpm /tmp/{packages[1]}.rpm
&& mv /tmp/{artifacts[0]} /tmp/{packages[0]}.rpm && mv /tmp/{artifacts[1]} /tmp/{packages[1]}.rpm
""")) # noqa: E501

# TODO: yum and downloaded packages results in post-install `rpm -q`
Expand Down

0 comments on commit 0bf5b80

Please sign in to comment.