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

Update step 7 in deployment of Oracle Linux 6+ #5764

Merged
merged 4 commits into from Aug 17, 2023

Conversation

JuanGarriuz
Copy link
Member

Description

The 7 step into Oracle Linux 6+ show the expected result.

Issues Resolved

#5713

Evidence

image

Test

1 - Go to Agents, select "Deploy a new agent".
2 - In step 1 click "Show more", "Oracle Linux".
3 - In step 2 click "Oracle Linux 6+".

image

4 - Go to step 7. It must show:

image

Check List

  • All tests pass
    • yarn test:jest
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

jbiset
jbiset previously approved these changes Aug 14, 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: ✔️

Test UI ✔️

Evidence

Evidence_1

Evidence_2

@lucianogorza lucianogorza self-requested a review August 14, 2023 13:53
@lucianogorza
Copy link
Member

CR: ✔️

Test UI ✔️

Evidence

image
image

lucianogorza
lucianogorza previously approved these changes Aug 14, 2023
CHANGELOG.md Outdated Show resolved Hide resolved
@Tostti Tostti changed the title Oracle Linux 6+ 7 Step updated Update step 7 in deployment of Oracle Linux 6+ Aug 14, 2023
@JuanGarriuz JuanGarriuz dismissed stale reviews from lucianogorza and jbiset via 3444d3b August 17, 2023 11:58
Copy link
Member

@Tostti Tostti left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@lucianogorza lucianogorza left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions
Copy link
Contributor

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

@Tostti Tostti merged commit b4fa960 into 4.5.2 Aug 17, 2023
2 checks passed
@Tostti Tostti deleted the fix/5713-oracle-linux-agent-command branch August 17, 2023 12:19
@github-actions
Copy link
Contributor

The backport to 4.5.2-7.16 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.16 4.5.2-7.16
# Navigate to the new working tree
cd .worktrees/backport-4.5.2-7.16
# Create a new branch
git switch --create backport-5764-to-4.5.2-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b4fa960b0e65fe75ff5f1b27317d0b35fc598c1b
# Push it to GitHub
git push --set-upstream origin backport-5764-to-4.5.2-7.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.5.2-7.16

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

@github-actions
Copy link
Contributor

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-5764-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 b4fa960b0e65fe75ff5f1b27317d0b35fc598c1b
# Push it to GitHub
git push --set-upstream origin backport-5764-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-5764-to-4.5.2-7.10.

JuanGarriuz added a commit that referenced this pull request Aug 17, 2023
* Oracle Linux 6+ 7 Step improved

* Update CHANGELOG.md

* Modify Changelog

(cherry picked from commit b4fa960)
asteriscos added a commit that referenced this pull request Aug 21, 2023
…5790)

Update step 7 in deployment of Oracle Linux 6+ (#5764)

* Oracle Linux 6+ 7 Step improved

* Update CHANGELOG.md

* Modify Changelog

(cherry picked from commit b4fa960)

Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.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.

The command indicated in the WUI to start the agent on Oracle Linux is incorrect
4 participants