Skip to content

Enhancement and fix for containerized pytest #3214

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.

Sign up for GitHub

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

Merged
ptoscano merged 2 commits into from
Mar 1, 2023
Merged

Enhancement and fix for containerized pytest #3214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a894837
tests: Install dnf-plugins-core every time
m-horky Feb 23, 2023
8f20aad
Remove pytest arguments for CentOS 9 Stream image
m-horky Feb 23, 2023
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
8 changes: 1 addition & 7 deletions .github/workflows/pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,7 @@ jobs:
include:
- name: "CentOS Stream 9"
image: "quay.io/centos/centos:stream9"
pytest_args: '--deselect test/rhsmlib/facts/test_hwprobe.py::HardwareProbeTest::test_networkinfo --deselect test/rhsmlib/test_facts.py::TestFactsDBusObject::test_GetFacts'
# The 'test_networkinfo' breaks in CentOS container because it has IPv6 disabled.
# Because of a bug in Python, collecting 'socket.AF_INET6' via 'socket.getaddrinfo()' causes
# segfaults instead of exceptions when the IPv6 network is not available.
# This deselect is a workaround until it is fixed or until we switch to a different way of
# collecting network facts.
# 'test_GetFacts' triggers full fact collection and causes the same error.
pytest_args: ''
- name: "Fedora latest"
image: "fedora:latest"
pytest_args: ''
Expand Down
9 changes: 4 additions & 5 deletions scripts/container-pre-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
#!/bin/bash

# Install essential packages
dnf --setopt install_weak_deps=False install -y \
dnf-plugins-core git gcc cmake python3 python3-devel python3-pip

source /etc/os-release
# These repositories are required for the 'libdnf-devel' package.
# Fedora has it available out of the box.
# RHEL needs it to be enabled via 'subscription-manager repos'.
if [[ $ID == "centos" && $VERSION == "9" ]]; then
dnf --setopt install_weak_deps=False install -y dnf-plugins-core
dnf config-manager --enable crb
fi

# Install essential packages
dnf --setopt install_weak_deps=False install -y \
git gcc cmake python3 python3-devel python3-pip

# Install system, build and runtime packages
dnf --setopt install_weak_deps=False install -y \
intltool dbus-daemon dbus-devel \
Expand Down