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.

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

Jump to bottom

Fixes for unblocking RHEL-10 container builds #5889

Merged
merged 2 commits into from
Sep 20, 2024
Merged

Fixes for unblocking RHEL-10 container builds #5889

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
5434325
infra: temporarily install selinux-policy-targeted in container
KKoukiou Jul 9, 2024
dc54427
tests: remove support for the MD linear RAID level
KKoukiou Sep 20, 2024
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
5 changes: 5 additions & 0 deletions dockerfile/anaconda-ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ COPY ["anaconda.spec.in", "requirements.txt", "/root/"]
RUN set -ex; \
# Update the base container packages
dnf update -y; \
# FIXME
# https://bugzilla.redhat.com/show_bug.cgi?id=2295428
# https://issues.redhat.com/browse/RHEL-46558
# Remove selinux-policy targeted when the rhbz / RHEL issue above is fixed
# Install rest of the dependencies
dnf install -y \
/usr/bin/xargs \
Expand All @@ -47,6 +51,7 @@ RUN set -ex; \
bzip2 \
rpm-ostree \
python3-pip \
selinux-policy-targeted \
rsync \
# Need to have restorecon for the tests execution
policycoreutils; \
Expand Down
6 changes: 5 additions & 1 deletion ...t_tests/pyanaconda_tests/modules/payloads/payload/test_module_payload_dnf_installation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ def test_set_rpm_macros_default(self, mock_rpm):
data = PackagesConfigurationData()

macros = [
('__dbi_htconfig', 'hash nofsync %{__dbi_other} %{__dbi_perms}')
('__dbi_htconfig', 'hash nofsync %{__dbi_other} %{__dbi_perms}'),
('__file_context_path', '/etc/selinux/targeted/contexts/files/file_contexts')
]

task = self._run_task(data)
Expand All @@ -73,6 +74,7 @@ def test_set_rpm_macros_exclude_docs(self, mock_rpm):
macros = [
('__dbi_htconfig', 'hash nofsync %{__dbi_other} %{__dbi_perms}'),
('_excludedocs', '1'),
('__file_context_path', '/etc/selinux/targeted/contexts/files/file_contexts')
]

task = self._run_task(data)
Expand All @@ -86,6 +88,7 @@ def test_set_rpm_macros_install_langs(self, mock_rpm):
macros = [
('__dbi_htconfig', 'hash nofsync %{__dbi_other} %{__dbi_perms}'),
('_install_langs', 'en:es'),
('__file_context_path', '/etc/selinux/targeted/contexts/files/file_contexts')
]

task = self._run_task(data)
Expand All @@ -99,6 +102,7 @@ def test_set_rpm_macros_no_install_langs(self, mock_rpm):
macros = [
('__dbi_htconfig', 'hash nofsync %{__dbi_other} %{__dbi_perms}'),
('_install_langs', '%{nil}'),
('__file_context_path', '/etc/selinux/targeted/contexts/files/file_contexts')
]

task = self._run_task(data)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit_tests/pyanaconda_tests/modules/storage/partitioning/test_module_scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def test_get_default_file_system(self):
def test_get_supported_raid_levels(self):
"""Test GetSupportedRaidLevels."""
assert self.interface.GetSupportedRaidLevels(DEVICE_TYPE_MD) == \
['linear', 'raid0', 'raid1', 'raid10', 'raid4', 'raid5', 'raid6']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this intended to be there ? I find it strange this is part of an infra PR ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well it's not an infra PR.
It's a PR with some fixes that are needed to re-enable building centos10 and centos9 containers

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even the 'infra' marked commit - has tests changes.

['raid0', 'raid1', 'raid10', 'raid4', 'raid5', 'raid6']

@patch('pyanaconda.modules.storage.partitioning.interactive.utils.get_format')
@patch('pyanaconda.modules.storage.partitioning.interactive.utils.platform', new_callable=EFI)
Expand Down
Loading