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.1](backport #30197) Revert #29031 #30209

Merged
merged 1 commit into from
Feb 9, 2022
Merged

[8.1](backport #30197) Revert #29031 #30209

merged 1 commit into from
Feb 9, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 4, 2022

This is an automatic backport of pull request #30197 done by Mergify.


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 #29031

This revert the code of the APM Instrumentation of the Elastic Agent.
To unblock the build of and the CI for other team. This would require
more investigation to really understand the problem.

Fixes elastic/fleet-server#1129

* fix make update

* fix linter

(cherry picked from commit 718c923)
@mergify mergify bot added the backport label Feb 4, 2022
@mergify mergify bot assigned ph Feb 4, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Feb 4, 2022
@ph
Copy link
Contributor

ph commented Feb 4, 2022

/test

@ph
Copy link
Contributor

ph commented Feb 4, 2022

I've reckicked it, pretty sure the failure were not related.

@ph ph added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Feb 4, 2022
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Feb 4, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 7, 2022

This pull request has not been merged yet. Could you please review and merge it @ph? 🙏

@ph
Copy link
Contributor

ph commented Feb 7, 2022

/test

@ph ph requested a review from stuartnelson3 February 7, 2022 16:21
@ph
Copy link
Contributor

ph commented Feb 7, 2022

@stuartnelson3 Can you take a look?

Copy link
Contributor

@stuartnelson3 stuartnelson3 left a comment

Choose a reason for hiding this comment

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

looks good to me!

@stuartnelson3
Copy link
Contributor

/test

@elasticmachine
Copy link
Collaborator

💔 Build Failed

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: 2022-02-09T13:14:34.668+0000

  • Duration: 141 min 33 sec

Test stats 🧪

Test Results
Failed 0
Passed 28915
Skipped 3157
Total 32072

Steps errors 2

Expand to view the steps failures

Build a job
  • Took 0 min 0 sec . View more details here
Error signal
  • Took 0 min 0 sec . View more details here
  • Description: Error 'co.elastic.BuildException'

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

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

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

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

@ph ph merged commit 706c11f into 8.1 Feb 9, 2022
@ph ph deleted the mergify/bp/8.1/pr-30197 branch February 9, 2022 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants