Merge 4.5.2 into 4.6.0 (#4458)

* refactor: bump revision * Fix package name in one_manager_agent system test environment * Add fix to changelog * Update CHANGELOG.md Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> * Update CHANGELOG.md Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> * Merge 4.5.1 into 4.5.2 (#4457) * fix: update VD validate xml test RHEL url * docs: include 4424 in changelog * fix(#4231): fix canonical tests * docs: change changelog line to include all changes * fix(#4411): Upgrading integration test dependencies for python in Mac (#4427) * docs: update changelog * docs: update changelog * docs: delete extra number sign * refactor: bump revision * Change revision to 4.5.1-rc2 (#4435) * Update Changelog --------- Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> Co-authored-by: BelenValdivia <belen.valdivia@wazuh.com> Co-authored-by: Jorge Marino <jorge.marino.dev@gmail.com> Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> Co-authored-by: Julia <juliamgnr@gmail.com> --------- Co-authored-by: Julia <juliamgnr@gmail.com> Co-authored-by: Julia Magán <80041853+juliamagan@users.noreply.github.com> Co-authored-by: Miguel Verdaguer Velázquez <verdx@riseup.net> Co-authored-by: Víctor Rebollo Pérez <victorrebollop@gmail.com> Co-authored-by: BelenValdivia <belen.valdivia@wazuh.com> Co-authored-by: Jorge Marino <jorge.marino.dev@gmail.com>
wazuh · Aug 24, 2023 · 48da786 · 48da786
1 parent a9dcd3c
commit 48da786
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -66,19 +66,28 @@ Release report: TBD
 Wazuh commit: TBD \
 Release report: TBD
 
-## [4.5.1] - TBD
+### Changed
 
-Wazuh commit: TBD \
-Release report: TBD
+- Fix one_manager_agent environment provisioning by packages for system tests ([#4438](https://github.com/wazuh/wazuh-qa/pull/4438)) \- (Framework)
+
+## [4.5.1] - 24-08-2023
+
+Wazuh commit: https://github.com/wazuh/wazuh/commit/731cdf39a430d2fb6fa02f3721624e07f887b02f
+Release report: https://github.com/wazuh/wazuh/issues/18475
 
 ### Added
 
 - Add an integration test to check the wazuh-analysisd's decoder parser ([#4286](https://github.com/wazuh/wazuh-qa/pull/4286)) \- (Tests)
 
-## [4.5.0] - TBD
+### Changed
 
-Wazuh commit: TBD \
-Release report: TBD
+- Update python integration test dependencies in the README ([#4427](https://github.com/wazuh/wazuh-qa/pull/4427)) \- (Documentation)
+- Update vulnerability detector IT outdated URLs ([#4428](https://github.com/wazuh/wazuh-qa/pull/4428)) \- (Tests)
+
+## [4.5.0] - 11-08-2023
+
+Wazuh commit: https://github.com/wazuh/wazuh/commit/f6aba151d08ef065dfc1bdc9b8885c3d4f618fca
+Release report: https://github.com/wazuh/wazuh/issues/18235
 
 ### Changed
 

diff --git a/tests/integration/README.md b/tests/integration/README.md
@@ -117,7 +117,7 @@ brew install python3
 brew install autoconf automake libtool
 
 # Install Python libraries
-pip3 install pytest freezegun jq jsonschema pyyaml==5.4 psutil paramiko distro pandas==0.25.3 pytest-html==2.0.1 numpydoc==0.9.2
+pip3 install filetype freezegun jq jsonschema lockfile numpydoc psutil pytest-html pytest-testinfra pyyaml
 ```
 
 - Add some internal options and restart

diff --git a/...st_vulnerability_detector/test_feeds/data/test_cases/cases_validate_xml_feed_content.yaml b/...st_vulnerability_detector/test_feeds/data/test_cases/cases_validate_xml_feed_content.yaml
@@ -7,7 +7,7 @@
     path: /tmp/com.redhat.rhsa-RHEL5.xml.bz2
     extension: bz2
     decompressed_file: /tmp/rhel5.xml
-    url: https://www.redhat.com/security/data/oval/com.redhat.rhsa-RHEL5.xml.bz2
+    url: https://feed.wazuh.com/vulnerability-detector/RHEL/5/com.redhat.rhsa-RHEL5_v1.xml.bz2
 
 - name: Red Hat Enterprise Linux
   description: Red Hat Enterprise Linux provider

diff --git a/tests/system/provisioning/one_manager_agent/roles/agent-role/tasks/main.yml b/tests/system/provisioning/one_manager_agent/roles/agent-role/tasks/main.yml
@@ -52,7 +52,7 @@
 - name: "Get agent package"
   ansible.builtin.get_url:
     url: "https://{{package_repository}}.wazuh.com/{{repository}}/apt/pool/main/w/wazuh-agent/wazuh-agent_{{package_version}}-{{package_revision}}_amd64.deb"
-    dest: /tmp/wazuh-manager.deb
+    dest: /tmp/wazuh-agent.deb
   when: wazuh_branch is not defined
 
 - name: "Install agent package"