fix config and skip more tests

wazuh · Dec 20, 2023 · bbe702b · bbe702b
1 parent c5879d2
commit bbe702b
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 306 deletions.
diff --git a/...ulnerability_detector/test_vulnerability_detector_linux/data/playbooks/configuration.yaml b/...ulnerability_detector/test_vulnerability_detector_linux/data/playbooks/configuration.yaml
@@ -40,7 +40,7 @@
           <vulnerability-detector>
           <enabled>yes</enabled>
           <index-status>yes</index-status>
-          <feed-update-interval>60m</feed-update-interval>
+          <feed-update-interval>60s</feed-update-interval>
           </vulnerability-detector>
         os: linux
 

diff --git a/...erability_detector/test_vulnerability_detector_linux/test_vulnerability_detector_linux.py b/...erability_detector/test_vulnerability_detector_linux/test_vulnerability_detector_linux.py
@@ -67,6 +67,7 @@
 pytestmark = [TIER0, LINUX]
 
 
+@pytest.mark.skip(reason="Vulnerability Detector was refactored. Some tests are deprecated.")
 @pytest.mark.filterwarnings('ignore::urllib3.exceptions.InsecureRequestWarning')
 @pytest.mark.parametrize('metadata', configuration_metadata, ids=cases_ids)
 def test_vulnerability_detector_linux(configure_environment, metadata, get_indexer_credentials, get_manager_ip,

diff --git a/...nerability_detector/test_vulnerability_detector_windows/data/playbooks/configuration.yaml b/...nerability_detector/test_vulnerability_detector_windows/data/playbooks/configuration.yaml
@@ -54,7 +54,7 @@
           <vulnerability-detector>
           <enabled>yes</enabled>
           <index-status>yes</index-status>
-          <feed-update-interval>60m</feed-update-interval>
+          <feed-update-interval>60s</feed-update-interval>
           </vulnerability-detector>
         os: linux
 

diff --git a/...lity_detector/test_vulnerability_detector_windows/test_vulnerability_detection_windows.py b/...lity_detector/test_vulnerability_detector_windows/test_vulnerability_detection_windows.py
@@ -68,6 +68,7 @@
 pytestmark = [TIER0, WINDOWS]
 
 
+@pytest.mark.skip(reason="Vulnerability Detector was refactored. Some tests are deprecated.")
 @pytest.mark.filterwarnings('ignore::urllib3.exceptions.InsecureRequestWarning')
 @pytest.mark.parametrize('metadata', configuration_metadata, ids=cases_ids)
 def test_vulnerability_detector_windows(configure_environment, metadata, get_indexer_credentials, get_manager_ip,

diff --git a/tests/system/provisioning/basic_environment/roles/manager-role/files/ossec.conf b/tests/system/provisioning/basic_environment/roles/manager-role/files/ossec.conf
@@ -79,13 +79,11 @@
     </synchronization>
   </wodle>
 
-  <wodle name="vulnerability-detector">
-    <disabled>no</disabled>
-    <interval>1d</interval>
-    <run_on_start>yes</run_on_start>
-    <update_ubuntu_oval interval="60m" version="16,14,12">yes</update_ubuntu_oval>
-    <update_redhat_oval interval="60m" version="7,6,5">yes</update_redhat_oval>
-  </wodle>
+  <vulnerability-detector>
+    <enabled>yes</enabled>
+    <index-status>yes</index-status>
+    <feed-update-interval>60m</feed-update-interval>
+  </vulnerability-detector>
 
   <wodle name="key-request">
     <enabled>yes</enabled>

diff --git a/tests/system/provisioning/big_cluster_40_agents/roles/master-role/files/ossec.conf b/tests/system/provisioning/big_cluster_40_agents/roles/master-role/files/ossec.conf
@@ -81,39 +81,6 @@
 
   <vulnerability-detector>
     <enabled>no</enabled>
-    <interval>5m</interval>
-    <ignore_time>6h</ignore_time>
-    <run_on_start>yes</run_on_start>
-
-    <provider name="canonical">
-      <enabled>no</enabled>
-      <os>precise</os>
-      <os>trusty</os>
-      <os>xenial</os>
-      <os>bionic</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="debian">
-      <enabled>no</enabled>
-      <os>wheezy</os>
-      <os>stretch</os>
-      <os>jessie</os>
-      <os>buster</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="redhat">
-      <enabled>no</enabled>
-      <update_from_year>2010</update_from_year>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="nvd">
-      <enabled>no</enabled>
-      <update_interval>1h</update_interval>
-    </provider>
-
   </vulnerability-detector>
 
   <syscheck>

diff --git a/tests/system/provisioning/big_cluster_40_agents/roles/worker-role/files/ossec.conf b/tests/system/provisioning/big_cluster_40_agents/roles/worker-role/files/ossec.conf
@@ -81,39 +81,6 @@
 
   <vulnerability-detector>
     <enabled>no</enabled>
-    <interval>5m</interval>
-    <ignore_time>6h</ignore_time>
-    <run_on_start>yes</run_on_start>
-
-    <provider name="canonical">
-      <enabled>no</enabled>
-      <os>precise</os>
-      <os>trusty</os>
-      <os>xenial</os>
-      <os>bionic</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="debian">
-      <enabled>no</enabled>
-      <os>wheezy</os>
-      <os>stretch</os>
-      <os>jessie</os>
-      <os>buster</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="redhat">
-      <enabled>no</enabled>
-      <update_from_year>2010</update_from_year>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="nvd">
-      <enabled>no</enabled>
-      <update_interval>1h</update_interval>
-    </provider>
-
   </vulnerability-detector>
 
   <syscheck>

diff --git a/tests/system/provisioning/enrollment_cluster/roles/master-role/files/ossec.conf b/tests/system/provisioning/enrollment_cluster/roles/master-role/files/ossec.conf
@@ -81,39 +81,6 @@
 
   <vulnerability-detector>
     <enabled>no</enabled>
-    <interval>5m</interval>
-    <ignore_time>6h</ignore_time>
-    <run_on_start>yes</run_on_start>
-
-    <provider name="canonical">
-      <enabled>no</enabled>
-      <os>precise</os>
-      <os>trusty</os>
-      <os>xenial</os>
-      <os>bionic</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="debian">
-      <enabled>no</enabled>
-      <os>wheezy</os>
-      <os>stretch</os>
-      <os>jessie</os>
-      <os>buster</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="redhat">
-      <enabled>no</enabled>
-      <update_from_year>2010</update_from_year>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="nvd">
-      <enabled>no</enabled>
-      <update_interval>1h</update_interval>
-    </provider>
-
   </vulnerability-detector>
 
   <syscheck>

diff --git a/tests/system/provisioning/enrollment_cluster/roles/worker-role/files/ossec.conf b/tests/system/provisioning/enrollment_cluster/roles/worker-role/files/ossec.conf
@@ -81,39 +81,6 @@
 
   <vulnerability-detector>
     <enabled>no</enabled>
-    <interval>5m</interval>
-    <ignore_time>6h</ignore_time>
-    <run_on_start>yes</run_on_start>
-
-    <provider name="canonical">
-      <enabled>no</enabled>
-      <os>precise</os>
-      <os>trusty</os>
-      <os>xenial</os>
-      <os>bionic</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="debian">
-      <enabled>no</enabled>
-      <os>wheezy</os>
-      <os>stretch</os>
-      <os>jessie</os>
-      <os>buster</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="redhat">
-      <enabled>no</enabled>
-      <update_from_year>2010</update_from_year>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="nvd">
-      <enabled>no</enabled>
-      <update_interval>1h</update_interval>
-    </provider>
-
   </vulnerability-detector>
 
   <syscheck>

diff --git a/tests/system/provisioning/four_manager_disconnected_node/roles/master-role/files/ossec.conf b/tests/system/provisioning/four_manager_disconnected_node/roles/master-role/files/ossec.conf
@@ -81,39 +81,6 @@
 
   <vulnerability-detector>
     <enabled>no</enabled>
-    <interval>5m</interval>
-    <ignore_time>6h</ignore_time>
-    <run_on_start>yes</run_on_start>
-
-    <provider name="canonical">
-      <enabled>no</enabled>
-      <os>precise</os>
-      <os>trusty</os>
-      <os>xenial</os>
-      <os>bionic</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="debian">
-      <enabled>no</enabled>
-      <os>wheezy</os>
-      <os>stretch</os>
-      <os>jessie</os>
-      <os>buster</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="redhat">
-      <enabled>no</enabled>
-      <update_from_year>2010</update_from_year>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="nvd">
-      <enabled>no</enabled>
-      <update_interval>1h</update_interval>
-    </provider>
-
   </vulnerability-detector>
 
   <syscheck>

diff --git a/tests/system/provisioning/four_manager_disconnected_node/roles/worker-role/files/ossec.conf b/tests/system/provisioning/four_manager_disconnected_node/roles/worker-role/files/ossec.conf
@@ -81,39 +81,6 @@
 
   <vulnerability-detector>
     <enabled>no</enabled>
-    <interval>5m</interval>
-    <ignore_time>6h</ignore_time>
-    <run_on_start>yes</run_on_start>
-
-    <provider name="canonical">
-      <enabled>no</enabled>
-      <os>precise</os>
-      <os>trusty</os>
-      <os>xenial</os>
-      <os>bionic</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="debian">
-      <enabled>no</enabled>
-      <os>wheezy</os>
-      <os>stretch</os>
-      <os>jessie</os>
-      <os>buster</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="redhat">
-      <enabled>no</enabled>
-      <update_from_year>2010</update_from_year>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="nvd">
-      <enabled>no</enabled>
-      <update_interval>1h</update_interval>
-    </provider>
-
   </vulnerability-detector>
 
   <syscheck>

diff --git a/tests/system/provisioning/manager_agent/roles/manager-role/files/ossec.conf b/tests/system/provisioning/manager_agent/roles/manager-role/files/ossec.conf
@@ -81,39 +81,6 @@
 
   <vulnerability-detector>
     <enabled>no</enabled>
-    <interval>5m</interval>
-    <ignore_time>6h</ignore_time>
-    <run_on_start>yes</run_on_start>
-
-    <provider name="canonical">
-      <enabled>no</enabled>
-      <os>precise</os>
-      <os>trusty</os>
-      <os>xenial</os>
-      <os>bionic</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="debian">
-      <enabled>no</enabled>
-      <os>wheezy</os>
-      <os>stretch</os>
-      <os>jessie</os>
-      <os>buster</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="redhat">
-      <enabled>no</enabled>
-      <update_from_year>2010</update_from_year>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="nvd">
-      <enabled>no</enabled>
-      <update_interval>1h</update_interval>
-    </provider>
-
   </vulnerability-detector>
 
   <syscheck>

diff --git a/tests/system/provisioning/manager_agent/roles/master-role/files/ossec.conf b/tests/system/provisioning/manager_agent/roles/master-role/files/ossec.conf
@@ -81,39 +81,6 @@
 
   <vulnerability-detector>
     <enabled>no</enabled>
-    <interval>5m</interval>
-    <ignore_time>6h</ignore_time>
-    <run_on_start>yes</run_on_start>
-
-    <provider name="canonical">
-      <enabled>no</enabled>
-      <os>precise</os>
-      <os>trusty</os>
-      <os>xenial</os>
-      <os>bionic</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="debian">
-      <enabled>no</enabled>
-      <os>wheezy</os>
-      <os>stretch</os>
-      <os>jessie</os>
-      <os>buster</os>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="redhat">
-      <enabled>no</enabled>
-      <update_from_year>2010</update_from_year>
-      <update_interval>1h</update_interval>
-    </provider>
-
-    <provider name="nvd">
-      <enabled>no</enabled>
-      <update_interval>1h</update_interval>
-    </provider>
-
   </vulnerability-detector>
 
   <syscheck>