Merge pull request #5770 from KKoukiou/selinux-revert

infra: Revert "infra: temporarily install selinux-policy-targeted in container
rhinstaller · Jul 16, 2024 · 467dddb · 467dddb
2 parents ef58dbf + b72bf72
commit 467dddb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/dockerfile/anaconda-ci/Dockerfile b/dockerfile/anaconda-ci/Dockerfile
@@ -39,10 +39,6 @@ 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 \
@@ -51,7 +47,6 @@ RUN set -ex; \
   bzip2 \
   rpm-ostree \
   python3-pip \
-  selinux-policy-targeted \
   rsync \
   # Need to have restorecon for the tests execution
   policycoreutils; \

diff --git a/...t_tests/pyanaconda_tests/modules/payloads/payload/test_module_payload_dnf_installation.py b/...t_tests/pyanaconda_tests/modules/payloads/payload/test_module_payload_dnf_installation.py
@@ -59,8 +59,7 @@ def test_set_rpm_macros_default(self, mock_rpm):
         data = PackagesConfigurationData()
 
         macros = [
-            ('__dbi_htconfig', 'hash nofsync %{__dbi_other} %{__dbi_perms}'),
-            ('__file_context_path', '/etc/selinux/targeted/contexts/files/file_contexts')
+            ('__dbi_htconfig', 'hash nofsync %{__dbi_other} %{__dbi_perms}')
         ]
 
         task = self._run_task(data)
@@ -74,7 +73,6 @@ 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)
@@ -88,7 +86,6 @@ 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)
@@ -102,7 +99,6 @@ 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)