PR#223: require the wget package - tests/selinux

tests / selinux

#223 require the wget package

Closed 2 years ago by mmalik. Opened 2 years ago by mmalik.

tests/ mmalik/selinux add-wget-requirement into main

fix the test descriptions

Milos Malik • 2 years ago

eb98a4c

require the wget package

Milos Malik • 2 years ago

2a4c3a2

selinux-policy/Library/common/Makefile

file modified

		`@@ -54,6 +54,7 @@`
		`@echo "Requires: selinux-policy-devel" >> $(METADATA)`
		`@echo "Requires: yum-utils" >> $(METADATA)`
		`@echo "Requires: python3 sqlite" >> $(METADATA)`
		`+ @echo "Requires: wget" >> $(METADATA)`
		`@echo "Provides: library(selinux-policy/common)" >> $(METADATA)`
		`@echo "RhtsRequires: library(distribution/epel)" >> $(METADATA)`
		`@echo "License: GPLv2" >> $(METADATA)`

selinux-policy/pcp-daemons-and-similar/Makefile

file modified

+2 -2

		`@@ -1,7 +1,7 @@`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
		`#`
		`# Makefile of /CoreOS/selinux-policy/Regression/pcp-daemons-and-similar`
		`- # Description: the services were running as initrc_t, now they are confined by SELinux`
		`+ # Description: SELinux interferes with various PCP services and related programs`
		`# Author: Milos Malik <mmalik@redhat.com>`
		`#`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
		`@@ -50,7 +50,7 @@`
		`@echo "Name: $(TEST)" >> $(METADATA)`
		`@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)`
		`@echo "Path: $(TEST_DIR)" >> $(METADATA)`
		`- @echo "Description: the services were running as initrc_t, now they are confined by SELinux" >> $(METADATA)`
		`+ @echo "Description: SELinux interferes with various PCP services and related programs" >> $(METADATA)`
		`@echo "Type: Regression" >> $(METADATA)`
		`@echo "TestTime: 90m" >> $(METADATA)`
		`@echo "RunFor: selinux-policy" >> $(METADATA)`

selinux-policy/pcp-daemons-and-similar/runtest.sh

file modified

+1 -1

		`@@ -3,7 +3,7 @@`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
		`#`
		`# runtest.sh of /CoreOS/selinux-policy/Regression/pcp-daemons-and-similar`
		`- # Description: the services were running as initrc_t, now they are confined by SELinux`
		`+ # Description: SELinux interferes with various PCP services and related programs`
		`# Author: Milos Malik <mmalik@redhat.com>`
		`#`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`

selinux-policy/ping-and-similar/Makefile

file modified

+2 -2

		`@@ -1,7 +1,7 @@`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
		`#`
		`# Makefile of /CoreOS/selinux-policy/Regression/ping-and-similar`
		`- # Description: the service was running as initrc_t or init_t, now it is confined by SELinux`
		`+ # Description: SELinux interferes with ping and related programs`
		`# Author: Milos Malik <mmalik@redhat.com>`
		`#`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
		`@@ -50,7 +50,7 @@`
		`@echo "Name: $(TEST)" >> $(METADATA)`
		`@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)`
		`@echo "Path: $(TEST_DIR)" >> $(METADATA)`
		`- @echo "Description: the service was running as initrc_t or init_t, now it is confined by SELinux" >> $(METADATA)`
		`+ @echo "Description: SELinux interferes with ping and related programs" >> $(METADATA)`
		`@echo "Type: Regression" >> $(METADATA)`
		`@echo "TestTime: 10m" >> $(METADATA)`
		`@echo "RunFor: selinux-policy" >> $(METADATA)`

selinux-policy/ping-and-similar/runtest.sh

file modified

+1 -1

		`@@ -3,7 +3,7 @@`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
		`#`
		`# runtest.sh of /CoreOS/selinux-policy/Regression/ping-and-similar`
		`- # Description: the service was running as initrc_t or init_t, now it is confined by SELinux`
		`+ # Description: SELinux interferes with ping and related programs`
		`# Author: Milos Malik <mmalik@redhat.com>`
		`#`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`

selinux-policy/rtkit-daemon-and-similar/Makefile

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
		`#`
		`# Makefile of /CoreOS/selinux-policy/Regression/rtkit-daemon-and-similar`
		`- # Description: the service was running as initrc_t, now it is confined by SELinux`
		`+ # Description: SELinux interferes with rtkit-daemon and related programs`
		`# Author: Milos Malik <mmalik@redhat.com>`
		`#`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`

selinux-policy/rtkit-daemon-and-similar/runtest.sh

file modified

+1 -1

		`@@ -3,7 +3,7 @@`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
		`#`
		`# runtest.sh of /CoreOS/selinux-policy/Regression/rtkit-daemon-and-similar`
		`- # Description: the service was running as initrc_t, now it is confined by SELinux`
		`+ # Description: SELinux interferes with rtkit-daemon and related programs`
		`# Author: Milos Malik <mmalik@redhat.com>`
		`#`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`

selinux-policy/tlp-and-similar/Makefile

file modified

+2 -2

		`@@ -1,7 +1,7 @@`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
		`#`
		`# Makefile of /CoreOS/selinux-policy/Regression/tlp-and-similar`
		`- # Description: the service was running as initrc_t or init_t, now it is confined by SELinux`
		`+ # Description: SELinux interferes with tlp and related programs`
		`# Author: Milos Malik <mmalik@redhat.com>`
		`#`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
		`@@ -50,7 +50,7 @@`
		`@echo "Name: $(TEST)" >> $(METADATA)`
		`@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)`
		`@echo "Path: $(TEST_DIR)" >> $(METADATA)`
		`- @echo "Description: the service was running as initrc_t or init_t, now it is confined by SELinux" >> $(METADATA)`
		`+ @echo "Description: SELinux interferes with tlp and related programs" >> $(METADATA)`
		`@echo "Type: Regression" >> $(METADATA)`
		`@echo "TestTime: 10m" >> $(METADATA)`
		`@echo "RunFor: selinux-policy" >> $(METADATA)`

selinux-policy/tlp-and-similar/runtest.sh

file modified

+1 -1

		`@@ -3,7 +3,7 @@`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
		`#`
		`# runtest.sh of /CoreOS/selinux-policy/Regression/tlp-and-similar`
		`- # Description: the service was running as initrc_t or init_t, now it is confined by SELinux`
		`+ # Description: SELinux interferes with tlp and related programs`
		`# Author: Milos Malik <mmalik@redhat.com>`
		`#`
		`# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`

mmalik commented 2 years ago

SELinux beaker library does NOT need the wget package, but the epel
library which is imported here, needs it. When the wget program
is not installed, which happens in various CI runs, the import of
epel library causes an error which is then propagated to all tests
which use the SELinux beaker library.
Hopefully, the added wget requirement will help to fix the epel
library import action.

1 new commit added

fix the test descriptions

2 years ago

mmalik commented 2 years ago

1 commit was added to see if modified tests work well with the modified library.

plautrba commented 2 years ago

I would expect this is fixed in the epel library.

mmalik commented 2 years ago

I expect the same thing, but this issue is already discussed for at least 5 weeks and no progress. This PR is basically a workaround until the EPEL library is fixed and the latest beakerlib-libraries package is available in the right repository.

Edited 2 years ago by mmalik