Skip to content

Commit

Permalink
Merge pull request rhinstaller#5753 from KKoukiou/bz-2295428-rhel
Browse files Browse the repository at this point in the history
infra: temporarily install selinux-policy-targeted in container
  • Loading branch information
KKoukiou committed Jul 9, 2024
2 parents 7b719c4 + 0e47267 commit ce36b88
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
5 changes: 5 additions & 0 deletions dockerfile/anaconda-ci/Dockerfile
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
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

0 comments on commit ce36b88

Please sign in to comment.