Skip to content

Commit

Permalink
Merge branch '4.8.0' into enhancement/4763-fix-onemanager-agent-env-t…
Browse files Browse the repository at this point in the history
…ests
  • Loading branch information
Deblintrake09 authored Dec 19, 2023
2 parents 0baa8e3 + af7944b commit 1a6294f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.
### Changed

- Fix one_manager_agent_env pytest marker for System Tests ([#4782](https:/wazuh/wazuh-qa/pull/4782)) \- (Tests)
- Include ATP repository update before the installation of Ubuntu E2E agent installation ([#4761](https:/wazuh/wazuh-qa/pull/4761)) \- (Framework)
- Enhance macOS deployment ansible taks ([#4685](https:/wazuh/wazuh-qa/pull/4685)) \- (Framework)
- Updated Filebeat module to 0.3 ([#4700](https:/wazuh/wazuh-qa/pull/4700)) \- (Framework)
- Change database v13 to v12. ([#4677](https:/wazuh/wazuh-qa/pull/4677)) \- (Tests)
Expand Down
4 changes: 3 additions & 1 deletion deps/wazuh_testing/wazuh_testing/tools/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ def control_service(action, daemon=None, debug_mode=False):
for _ in range(error_109_windows_retry):
command = subprocess.run(["net", action, "WazuhSvc"], stderr=subprocess.PIPE)
result = command.returncode
if result != 0:
if result == 0:
break
else:
if action == 'stop' and 'The Wazuh service is not started.' in command.stderr.decode():
result = 0
break
Expand Down
6 changes: 6 additions & 0 deletions provisioning/roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
register: wazuh_agent_ca_package_install
until: wazuh_agent_ca_package_install is succeeded

- name: Update apt-get repo and cache
apt:
update_cache: yes
force_apt_get: yes
cache_valid_time: 3600

- name: Debian/Ubuntu | Install apt-transport-https and acl
apt:
name:
Expand Down

0 comments on commit 1a6294f

Please sign in to comment.