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

[main](backport #3356) Revert changes to RemovePath #3358

Merged
merged 1 commit into from
Sep 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 5, 2023

This is an automatic backport of pull request #3356 done by Mergify.
Cherry-pick of 9e656b7 has failed:

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

You are currently cherry-picking commit 9e656b7e31.
  (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:   internal/pkg/agent/install/uninstall.go
	modified:   internal/pkg/agent/install/uninstall_unix.go
	modified:   internal/pkg/agent/install/uninstall_windows.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: changelog/fragments/1691060806-Processor-support-for-hints-autodiscover.yaml

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

Revert "correctly identify retryable errors when uninstalling on Windows (#3317) (#3324)"
  -  commit 49e6cb9.

Revert "add ticker to uninstall RemovePath and error explain what was attempted (#3249) (#3270)"
  - commit 347ea8b.

(cherry picked from commit 9e656b7)

# Conflicts:
#	changelog/fragments/1691060806-Processor-support-for-hints-autodiscover.yaml
@mergify mergify bot requested a review from a team as a code owner September 5, 2023 18:05
@mergify mergify bot requested review from ycombinator and AndersonQ September 5, 2023 18:05
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 5, 2023
@elastic-sonarqube
Copy link

SonarQube Quality Gate

Quality Gate failed

Failed condition 0.0% 0.0% Coverage on New Code (is less than 40%)

See analysis details on SonarQube

@elasticmachine
Copy link
Contributor

💚 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-09-05T18:05:22.602+0000

  • Duration: 26 min 14 sec

Test stats 🧪

Test Results
Failed 0
Passed 6253
Skipped 55
Total 6308

💚 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
Contributor

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 98.765% (80/81) 👍
Files 67.719% (193/285) 👍
Classes 66.292% (354/534) 👍
Methods 53.037% (1109/2091) 👍
Lines 38.6% (12651/32775) 👎 -0.027
Conditionals 100.0% (0/0) 💚

@cmacknz
Copy link
Member

cmacknz commented Sep 6, 2023

@AndersonQ let's get this merged to ensure main is in the same state as 8.10 here.

@pierrehilbert pierrehilbert added the Team:Elastic-Agent Label for the Agent team label Sep 7, 2023
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

@AndersonQ AndersonQ enabled auto-merge (squash) September 7, 2023 11:48
@AndersonQ
Copy link
Member

@cmacknz it's ready, it just needs to be force merged

@cmacknz
Copy link
Member

cmacknz commented Sep 7, 2023

Merging, no new test failures.

@cmacknz cmacknz disabled auto-merge September 7, 2023 18:51
@cmacknz cmacknz merged commit 00a33a2 into main Sep 7, 2023
@cmacknz cmacknz deleted the mergify/bp/main/pr-3356 branch September 7, 2023 18:51
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 Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants