Skip to content

Commit

Permalink
Merge pull request #5777 from wazuh/enhancement/wz24157-macOS_Sequoia…
Browse files Browse the repository at this point in the history
…_support

Adding macOS Sequoia support
  • Loading branch information
rauldpm authored Oct 10, 2024
2 parents 050cdfe + 42a0680 commit c04e805
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.

### Added

- Add support for macOS 15 (Sequoia) to the DTT tests ([#5777](https://github.com/wazuh/wazuh-qa/pull/5777)) \- (Tests)
- Added support for macOS 15 (Vagrant) to the Allocation module ([#5743](https://github.com/wazuh/wazuh-qa/pull/5743)) \- (Framework)
- Add Ubuntu 24.04 support to Deployability testing tier 1 ([#5689])(https://github.com/wazuh/wazuh-qa/pull/5689) \- (Tests)
- Added support for macOS 14.6 to the Allocation module (Vagrant) ([#5671](https://github.com/wazuh/wazuh-qa/pull/5671)) \- (Framework)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ variables:
macos-agent-os:
- macos-ventura-13-amd64
- macos-sonoma-14-amd64
- macos-sequoia-15-amd64

manager-os: linux-ubuntu-22.04-amd64
infra-provider: aws
Expand Down
9 changes: 5 additions & 4 deletions deployability/modules/testing/tests/helpers/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -872,11 +872,12 @@ def is_component_active(inventory_path, host_role) -> bool:
return result.get('success')

elif os_type == 'macos':
result = ConnectionManager.execute_commands(inventory_path, f'ps aux | grep {host_role} | grep -v grep')
if result.get('output') == None:
return False
else:
result = ConnectionManager.execute_commands(inventory_path, f'/Library/Ossec/bin/wazuh-control status | grep {host_role}')
status = result.get('output')
if 'active' in status or 'Running' in status or 'is running' in status:
return result.get('success')
else:
return False


class Waits:
Expand Down

0 comments on commit c04e805

Please sign in to comment.