From c7d30dffc7fb33863a91582c759d40e09e6e0e94 Mon Sep 17 00:00:00 2001 From: mickael e Date: Thu, 4 Feb 2021 17:08:25 -0500 Subject: [PATCH] Fix test for Focal kernel version --- molecule/testinfra/common/test_grsecurity.py | 5 ++++- molecule/testinfra/vars/staging.yml | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/molecule/testinfra/common/test_grsecurity.py b/molecule/testinfra/common/test_grsecurity.py index a9e4faf15e..be1dd89d8f 100644 --- a/molecule/testinfra/common/test_grsecurity.py +++ b/molecule/testinfra/common/test_grsecurity.py @@ -4,7 +4,10 @@ import testutils sdvars = testutils.securedrop_test_vars -KERNEL_VERSION = sdvars.grsec_version +if host.system_info.codename == "xenial": + KERNEL_VERSION = sdvars.grsec_version_xenial +else: + KERNEL_VERSION = sdvars.grsec_version_focal testinfra_hosts = [sdvars.app_hostname, sdvars.monitor_hostname] diff --git a/molecule/testinfra/vars/staging.yml b/molecule/testinfra/vars/staging.yml index 9e32406a4d..6a26c292e7 100644 --- a/molecule/testinfra/vars/staging.yml +++ b/molecule/testinfra/vars/staging.yml @@ -197,4 +197,5 @@ log_events_with_ossec_alerts: rule_id: "400700" fpf_apt_repo_url: "https://apt-test.freedom.press" -grsec_version: "4.14.188" +grsec_version_xenial: "4.14.188" +grsec_version_focal: "5.4.88"