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

[8.7](backport #2384) Minor code cleanup #2464

Merged
merged 2 commits into from
Apr 6, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 6, 2023

This is an automatic backport of pull request #2384 done by Mergify.
Cherry-pick of e4768d5 has failed:

On branch mergify/bp/8.7/pr-2384
Your branch is up to date with 'origin/8.7'.

You are currently cherry-picking commit e4768d517c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pkg/component/runtime/command.go
	modified:   pkg/component/runtime/manager.go
	modified:   pkg/component/runtime/runtime_comm.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Vagrantfile
	both modified:   internal/pkg/agent/application/coordinator/coordinator.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Formatting

* Update ubuntu release

* Revert unsafe change

(cherry picked from commit e4768d5)

# Conflicts:
#	Vagrantfile
#	internal/pkg/agent/application/coordinator/coordinator.go
@mergify mergify bot requested a review from a team as a code owner April 6, 2023 04:28
@mergify mergify bot removed the request for review from a team April 6, 2023 04:28
@mergify mergify bot added the backport label Apr 6, 2023
@mergify mergify bot requested a review from michel-laterman April 6, 2023 04:28
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Apr 6, 2023
@mergify mergify bot requested a review from pchila April 6, 2023 04:28
@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 6, 2023

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-04-06T04:33:37.971+0000

  • Duration: 17 min 0 sec

Test stats 🧪

Test Results
Failed 0
Passed 5003
Skipped 23
Total 5026

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages.

  • run integration tests : Run the Elastic Agent Integration tests.

  • run end-to-end tests : Generate the packages and run the E2E Tests.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@elasticmachine
Copy link
Collaborator

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 98.387% (61/62) 👍
Files 68.72% (145/211) 👍
Classes 67.822% (274/404) 👍
Methods 53.434% (848/1587) 👍
Lines 38.805% (9451/24355) 👍 0.015
Conditionals 100.0% (0/0) 💚

@ycombinator ycombinator merged commit 115ffc5 into 8.7 Apr 6, 2023
@ycombinator ycombinator deleted the mergify/bp/8.7/pr-2384 branch April 6, 2023 04:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants