Skip to content

Commit

Permalink
Merge 4.5.0 into 4.5.1 (#1421)
Browse files Browse the repository at this point in the history
* Create regression_testing.md

* Update regression_testing.md

* Create regression_testing.md

* Update regression_testing.md

* Create regression_testing.md

* Update regression_testing.md

* Bump 4.5.0

* Merge 4.4.5 into 4.4 (#1419) (#1420)

* Bump Wazuh 4.4.5 (#1415)

* Update changelog

* Update package.json

* Update tag script

* Change rc_number to 0

* Change tag.py branch name

* Bump v4.4.5-8.2

* Bump RC1

---------

Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>

---------

Co-authored-by: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com>
Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
  • Loading branch information
3 people committed Jul 11, 2023
1 parent b76f12d commit 49188c1
Show file tree
Hide file tree
Showing 6 changed files with 99 additions and 9 deletions.
85 changes: 85 additions & 0 deletions .github/ISSUE_TEMPLATE/regression_testing.md
@@ -0,0 +1,85 @@
---
name: Release Candidate - UI regression testing
about: Report the results after running UI manual tests.
title: 'Release [WAZUH VERSION] - Release Candidate [RC VERSION] - Splunk UI regression testing'
labels: 'level/task, type/test'
assignees: ''

---

The following issue aims to run manual tests for the current release candidate, report the results, and open new issues for any encountered errors.

## Splunk UI tests information
| | |
|----------------------------------------|-----|
| **Main release candidate issue** | |
| **Version** | |
| **Release candidate #** | |
| **Tag** | |
| **Previous UI regression tests issue** | |

## Test report procedure

**TL;DR**
1. The specified tests will be executed in every platform and version mentioned in this issue.
1. Include evidence of each test performed.
1. Report any problem or bug. Open a new issue for each of them and link them here.
1. Justify skipped tests.


All test results must have one the following statuses:
| | |
|-----------------|----------------------------------------------------------------------|
| :black_circle: | The test hasn't started yet. |
| :green_circle: | All checks passed. |
| :red_circle: | There is at least one failed check. |
| :yellow_circle: | There is at least one expected fail or skipped test and no failures. |


Any failing test must be properly addressed with a new issue, detailing the error and the possible cause.
It must be included in the `Problems` section of the current release candidate issue.

Any expected fail or skipped test must be justified with a reason.
All auditors must validate the justification for an expected fail or skipped test.

An extended report of the test results must be attached as a zip, txt or images.
This report can be used by the auditors to dig deeper into any possible failures and details.

## Test template

| Test | Chrome | Firefox | Safari |
|------|----------------|----------------|----------------|
| - | :black_circle: | :black_circle: | :black_circle: |


## Test plan

1. Verify the app package installs and operates as expected.
2. [ISSUES]


## Conclusions

| Status | Platform |
|----------------|------------|
| :black_circle: | Splunk 8.1 |
| :black_circle: | Splunk 8.2 |

See [Supported versions](https://github.com/wazuh/wazuh-splunk/wiki/Compatibility).

<!-- ** Copy and paste as a new comment. Modify as needed. **
## Conclusions
All tests have been executed and the results can be above.
All tests have passed and the fails have been reported or justified. I therefore conclude that this issue is finished and OK for this release candidate.
-->

## Auditors validation
The definition of done for this one is the validation of the conclusions and the test results from all auditors.

All checks from below must be accepted in order to close this issue.

- [ ]
5 changes: 5 additions & 0 deletions CHANGELOG.md
Expand Up @@ -12,6 +12,11 @@ All notable changes to the Wazuh App for Splunk project will be documented in th
### Added
- Added support for Wazuh 4.5.0.

## Wazuh v4.4.5 - Splunk Enterprise v8.1.[1-10], v8.2.x - Revision 4405

### Added
- Added support for Wazuh 4.4.5.

## Wazuh v4.4.4 - Splunk Enterprise v8.1.[1-10], v8.2.x - Revision 4404

### Added
Expand Down
@@ -1,6 +1,6 @@
const UI_METADATA = {
"version": "4.4.4",
"revision": "4404"
"version": "4.5.0",
"revision": "4500"
}

define(['../module'], function (module) {
Expand Down
4 changes: 2 additions & 2 deletions SplunkAppForWazuh/default/app.conf
Expand Up @@ -3,7 +3,7 @@ is_visible = 1
label = Wazuh

[launcher]
version = 4.4.4
version = 4.5.0
author = info@wazuh.com
description = Wazuh helps you to gain deeper security visibility into your infrastructure by monitoring hosts at an operating system and application level.

Expand All @@ -12,7 +12,7 @@ id = SplunkAppForWazuh
check_for_updates = 1

[install]
build = 4404
build = 4405

[triggers]
reload.package = simple
Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -39,7 +39,7 @@
"pretty": "make pretty",
"test": "mocha tests/manager.js"
},
"version": "4.4.4",
"revision": "4404",
"version": "4.5.0",
"revision": "4500",
"splunk": "8.2"
}
6 changes: 3 additions & 3 deletions scripts/tag.py
Expand Up @@ -17,18 +17,18 @@
# Splunk versions
supported_versions = ['8.1', '8.2']
# Wazuh version
version = '4.4.4'
version = '4.5.0'
# RC number(optional, set to 0 or None to disable)
rc_number = 1
# App's revision number (previous rev + 1)
revision = '4404'
revision = '4500'
# Debug mode
dry_run = False

# ================================================ #
# Constants and global variables #
# ================================================ #
BRANCH = ".".join(version.split('.')[:2])
BRANCH = version
LOG_FILE = 'output.log'
TAGS_FILE = 'tags.log'

Expand Down

0 comments on commit 49188c1

Please sign in to comment.