Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve versioning of the wazuh testing framework #4172

Merged
merged 9 commits into from
May 26, 2023
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

All notable changes to this project will be documented in this file.

### Fixed
- Changed the last uses of 4.4.2 in setup.py and schema.yaml. ([#4172](https:/wazuh/wazuh-qa/pull/4172)) \- (Framework)

## [4.4.2] - TBD

### Added
Expand Down
12 changes: 11 additions & 1 deletion deps/wazuh_testing/setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Copyright (C) 2015-2021, Wazuh Inc.
# Created by Wazuh, Inc. <[email protected]>.
# This program is free software; you can redistribute it and/or modify it under the terms of GPLv2
import json
from setuptools import setup, find_packages
import os

Expand Down Expand Up @@ -55,12 +56,21 @@ def get_files_from_directory(directory):
paths.append(os.path.join('..', path, filename))
return paths

def get_version():
script_path = os.path.dirname(__file__)
rel_path = "../../version.json"
abs_file_path = os.path.join(script_path, rel_path)
f = open(abs_file_path)
data = json.load(f)
version = data['version']
return version


package_data_list.extend(get_files_from_directory('wazuh_testing/qa_docs/search_ui'))

setup(
name='wazuh_testing',
version='4.4.0',
version=get_version(),
description='Wazuh testing utilities to help programmers automate tests',
url='https:/wazuh',
author='Wazuh',
Expand Down
2 changes: 2 additions & 0 deletions deps/wazuh_testing/wazuh_testing/qa_docs/schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ predefined_values:
- 4.2.0
- 4.3.0
- 4.4.0
- 4.4.1
- 4.4.2
tags:
- active_response
- agentd
Expand Down