Skip to content
This repository was archived by the owner on Jan 23, 2024. It is now read-only.

apm: Neutral naming for apm-agent-java (backport #1375)#1406

Merged
v1v merged 2 commits into7.xfrom
mergify/bp/7.x/pr-1375
Jan 25, 2022
Merged

apm: Neutral naming for apm-agent-java (backport #1375)#1406
v1v merged 2 commits into7.xfrom
mergify/bp/7.x/pr-1375

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jan 25, 2022

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

On branch mergify/bp/7.x/pr-1375
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 5385134.
  (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:   docker/java/spring/Dockerfile
	modified:   scripts/modules/apm_agents.py
	modified:   scripts/tests/test_service.py
	modified:   tests/versions/java.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   README.md

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

@v1v
apm: Neutral naming for apm-agent-java (#1375)
89f1a05 
(cherry picked from commit 5385134)

# Conflicts:
#	README.md
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 25, 2022
@mergify mergify bot assigned v1v Jan 25, 2022
v1v
v1v reviewed Jan 25, 2022
View reviewed changes
@ghost
Copy link
Copy Markdown

ghost commented Jan 25, 2022

💔 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-01-25T11:51:16.509+0000

  • Duration: 32 min 29 sec

  • Commit: 89f1a05

Test stats 🧪

Test Results
Failed 0
Passed 272
Skipped 1
Total 273

Steps errors 1

Expand to view the steps failures

Error signal
  • Took 0 min 0 sec . View more details here
  • Description: Downstream job for 'All' failed

🤖 GitHub comments

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

  • /test : Re-trigger the build.

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

@v1v v1v removed the conflicts There is a conflict in the backported pull request label Jan 25, 2022
@v1v v1v merged commit 3ea797f into 7.x Jan 25, 2022
@mergify mergify bot deleted the mergify/bp/7.x/pr-1375 branch January 25, 2022 13:28
@ghost
Copy link
Copy Markdown

ghost commented Jan 25, 2022

❕ Build Aborted

Either there was a build timeout or someone aborted the build.

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

Expand to view the summary

Build stats

  • Start Time: 2022-01-25T11:52:31.523+0000

  • Duration: 184 min 1 sec

  • Commit: ef816fe

Test stats 🧪

Test Results
Failed 0
Passed 268
Skipped 1
Total 269

Steps errors 1

Expand to view the steps failures

Error signal
  • Took 0 min 0 sec . View more details here
  • Description: Downstream job for 'All' failed

🤖 GitHub comments

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

  • /test : Re-trigger the build.

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@v1v v1v v1v left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@v1v v1v

Labels

backport

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@v1v