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

Add environments for 4.5 #5797

Merged
merged 8 commits into from
Sep 5, 2023
Merged

Add environments for 4.5 #5797

merged 8 commits into from
Sep 5, 2023

Conversation

yenienserrano
Copy link
Member

@yenienserrano yenienserrano commented Aug 22, 2023

Description

Add environments for 4.5

To work, you need docker compose version 2.20.2

docker/compose#10804

https://github.com/docker/compose/releases/tag/v2.20.2

@chantal-kelm chantal-kelm self-requested a review August 23, 2023 11:14
chantal-kelm
chantal-kelm previously approved these changes Aug 23, 2023
Copy link
Contributor

@chantal-kelm chantal-kelm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dev environment:

Captura de pantalla 2023-08-23 a la(s) 10 27 48

Pre environment:

Captura de pantalla 2023-08-23 a la(s) 11 41 17

Rel environment:

Captura de pantalla 2023-08-23 a la(s) 11 57 47

chantal-kelm
chantal-kelm previously approved these changes Aug 23, 2023
jbiset
jbiset previously approved these changes Aug 23, 2023
Copy link
Member

@jbiset jbiset left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CR: 🟢

Tests

It is necessary to have a version of docker compose equal to or greater than v2.20.2, since in that version support for depends_on.require is added.
Used Docker Compose version v2.20.3

osd-dev: 🟢

  • WITHOUT SAML

Evidence_containers_osd-dev

Evidence_osd-dev

  • WITH SAML

Evidence_containers_osd-dev_saml

Evidence_osd-dev_saml

wazuh-4.5-wz 🟢

prerelease environment

Evidence_containers_Wazuh-4 5 0_pre

Evidence_Wazuh-4 5 0_pre

release environment

  • WITHOUT SAML

Evidence_containers_Wazuh-4 5 0_rel

Evidence_Wazuh-4 5 0_rel

  • WITH SAML

Evidence_containers_Wazuh-4 5 0_rel_saml

Evidence_Wazuh-4 5 0_rel_saml

@yenienserrano yenienserrano changed the base branch from 4.5.1 to 4.5.2 August 25, 2023 07:51
@yenienserrano yenienserrano dismissed stale reviews from jbiset and chantal-kelm August 25, 2023 07:51

The base branch was changed.

@chantal-kelm chantal-kelm self-requested a review August 25, 2023 11:37
chantal-kelm
chantal-kelm previously approved these changes Aug 25, 2023
jbiset
jbiset previously approved these changes Aug 25, 2023
@yenienserrano yenienserrano dismissed stale reviews from chantal-kelm and jbiset via 46eaf9d September 5, 2023 07:52
@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2023

Code coverage (Jest) % values
Statements 8.78% ( 3244 / 36913 )
Branches 4.49% ( 1285 / 28577 )
Functions 7.63% ( 698 / 9146 )
Lines 8.84% ( 3129 / 35356 )

Copy link
Member

@Desvelao Desvelao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

This pull request was approved previously by some co-workers. I made some request changes that dismissed the approbation.

@Desvelao Desvelao merged commit 622f346 into 4.5.2 Sep 5, 2023
@Desvelao Desvelao deleted the add-environments-for-4.5 branch September 5, 2023 10:23
github-actions bot pushed a commit that referenced this pull request Sep 5, 2023
* Add environments for 4.5

* Add saml required: false

* Fix readme

* Fix readme 4.4

* Update README.md

* Update README.md

(cherry picked from commit 622f346)
@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2023

The backport to 4.5.2-7.10 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.5.2-7.10 4.5.2-7.10
# Navigate to the new working tree
cd .worktrees/backport-4.5.2-7.10
# Create a new branch
git switch --create backport-5797-to-4.5.2-7.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 622f346ecbfdec2edd43326cdfd9bc01ec0cccd7
# Push it to GitHub
git push --set-upstream origin backport-5797-to-4.5.2-7.10
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.5.2-7.10

Then, create a pull request where the base branch is 4.5.2-7.10 and the compare/head branch is backport-5797-to-4.5.2-7.10.

Desvelao pushed a commit that referenced this pull request Sep 5, 2023
Add environments for 4.5 (#5797)

* Add environments for 4.5

* Add saml required: false

* Fix readme

* Fix readme 4.4

* Update README.md

* Update README.md

(cherry picked from commit 622f346)

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
yenienserrano added a commit that referenced this pull request Sep 5, 2023
* Add environments for 4.5

* Add saml required: false

* Fix readme

* Fix readme 4.4

* Update README.md

* Update README.md

(cherry picked from commit 622f346)
Desvelao pushed a commit that referenced this pull request Sep 5, 2023
Add environments for 4.5 (#5797)

* Add environments for 4.5

* Add saml required: false

* Fix readme

* Fix readme 4.4

* Update README.md

* Update README.md

(cherry picked from commit 622f346)
Desvelao added a commit that referenced this pull request Sep 7, 2023
* Bump revision to 02 (4.5.2) (#5844)

bump: revision to 02

* Add environments for 4.5 (#5797)

* Add environments for 4.5

* Add saml required: false

* Fix readme

* Fix readme 4.4

* Update README.md

* Update README.md

---------

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
Desvelao added a commit that referenced this pull request Sep 7, 2023
* [Backport 4.5.2-7.10] Bump revision to 02 (4.5.2) (#5847)

Bump revision to 02 (4.5.2) (#5844)

bump: revision to 02
(cherry picked from commit 2664730)

* [Backport 4.5.2-7.10]Add environments for 4.5 (#5797) (#5851)

Add environments for 4.5 (#5797)

* Add environments for 4.5

* Add saml required: false

* Fix readme

* Fix readme 4.4

* Update README.md

* Update README.md

(cherry picked from commit 622f346)

---------

Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
Desvelao added a commit that referenced this pull request Sep 7, 2023
* [Backport 4.5.2-7.16] Bump revision to 02 (4.5.2) (#5846)

Bump revision to 02 (4.5.2) (#5844)

bump: revision to 02
(cherry picked from commit 2664730)

* [Backport 4.5.2-7.16] Add environments for 4.5 (#5850)

Add environments for 4.5 (#5797)

* Add environments for 4.5

* Add saml required: false

* Fix readme

* Fix readme 4.4

* Update README.md

* Update README.md

(cherry picked from commit 622f346)

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>

---------

Co-authored-by: Antonio <34042064+Desvelao@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Desvelao added a commit that referenced this pull request Sep 7, 2023
* Bump 4.5.3 (#5824)

* Merge 4.5.2 into 4.5.3 (#5856)

* Bump revision to 02 (4.5.2) (#5844)

bump: revision to 02

* Add environments for 4.5 (#5797)

* Add environments for 4.5

* Add saml required: false

* Fix readme

* Fix readme 4.4

* Update README.md

* Update README.md

---------

Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>

---------

Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
Co-authored-by: Ian Yenien Serrano <63758389+yenienserrano@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants