From 2f095566c7fa87ea02cec43418799788d694de0d Mon Sep 17 00:00:00 2001 From: Hideki Saito Date: Tue, 15 Oct 2024 17:10:56 +0900 Subject: [PATCH] Modify conditions for selinux integratuion tests Signed-off-by: Hideki Saito --- changelogs/fragments/581_ci_selinux.yml | 3 +++ tests/integration/targets/selinux/tasks/selinux.yml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/581_ci_selinux.yml diff --git a/changelogs/fragments/581_ci_selinux.yml b/changelogs/fragments/581_ci_selinux.yml new file mode 100644 index 0000000..c38b2f2 --- /dev/null +++ b/changelogs/fragments/581_ci_selinux.yml @@ -0,0 +1,3 @@ +--- +trivial: + - selinux - conditions for selinux integration tests have been modified to be more accurate. diff --git a/tests/integration/targets/selinux/tasks/selinux.yml b/tests/integration/targets/selinux/tasks/selinux.yml index b9cfb20..b6ab7cc 100644 --- a/tests/integration/targets/selinux/tasks/selinux.yml +++ b/tests/integration/targets/selinux/tasks/selinux.yml @@ -128,8 +128,8 @@ ansible.builtin.assert: that: - selinux_config_original | length == selinux_config_after | length - - selinux_config_after[selinux_config_after.index('SELINUX=disabled')] is search("^SELINUX=\w+$") - - selinux_config_after[selinux_config_after.index('SELINUXTYPE=targeted')] is search("^SELINUXTYPE=\w+$") + - (selinux_config_after | select("search", "^SELINUX=disabled\s*$") | list | length) > 0 + - (selinux_config_after | select("search", "^SELINUXTYPE=targeted\s*$") | list | length) > 0 - name: TEST 1 | Disable SELinux again, with kernel arguments update ansible.posix.selinux: