Skip to content

[8.0](backport #29710) use main default branch#30179

Merged
v1v merged 6 commits into8.0from
mergify/bp/8.0/pr-29710
Mar 1, 2022
Merged

[8.0](backport #29710) use main default branch#30179
v1v merged 6 commits into8.0from
mergify/bp/8.0/pr-29710

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Feb 3, 2022 •
edited by zube bot
Loading

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

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

You are currently cherry-picking commit 237937085.
  (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:   .ci/apm-beats-update.groovy
	modified:   .ci/beats-tester-bc.groovy
	modified:   .ci/beats-tester.groovy
	modified:   .ci/build-docker-images.groovy
	modified:   .ci/jobs/beats-schedule-daily.yml
	modified:   .ci/jobs/beats-schedule-weekly.yml
	modified:   .ci/jobs/beats-test-infra.yml
	modified:   .ci/jobs/beats-tester-bc.yml
	modified:   .ci/jobs/build-it-docker-images.yml
	modified:   .ci/packer_cache.sh
	modified:   CHANGELOG-developer.asciidoc
	modified:   CHANGELOG-developer.next.asciidoc
	modified:   CHANGELOG.next.asciidoc
	modified:   Jenkinsfile
	modified:   dev-tools/cherrypick_pr
	modified:   dev-tools/merge_pr
	modified:   dev-tools/open_pr
	modified:   docs/devguide/contributing.asciidoc
	modified:   docs/devguide/create-metricset.asciidoc
	modified:   docs/devguide/metricset-details.asciidoc
	modified:   docs/devguide/migrate-dashboards.asciidoc
	modified:   libbeat/docs/communitybeats.asciidoc
	modified:   libbeat/docs/upgrading.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .ci/jobs/apm-beats-update.yml
	both modified:   .ci/jobs/beats-tester.yml
	both modified:   .ci/jobs/beats.yml
	both modified:   .ci/jobs/packaging.yml
	both modified:   .ci/schedule-daily.groovy
	both modified:   .ci/schedule-weekly.groovy
	both modified:   .mergify.yml
	both modified:   README.md
	deleted by us:   filebeat/_meta/test/docs/testing.md
	both modified:   x-pack/elastic-agent/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
use main default branch (#29710)
7b7fa34 
(cherry picked from commit 2379370)

# Conflicts:
#	.ci/jobs/apm-beats-update.yml
#	.ci/jobs/beats-tester.yml
#	.ci/jobs/beats.yml
#	.ci/jobs/packaging.yml
#	.ci/schedule-daily.groovy
#	.ci/schedule-weekly.groovy
#	.mergify.yml
#	README.md
#	filebeat/_meta/test/docs/testing.md
#	x-pack/elastic-agent/README.md
@mergify mergify bot requested a review from a team as a code owner February 3, 2022 10:07
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Feb 3, 2022
@mergify mergify bot assigned v1v Feb 3, 2022
@botelastic botelastic bot added Team:Automation Label for the Observability productivity team needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Feb 3, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Feb 3, 2022 •
edited by jenkins-beats-ci bot
Loading

💚 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: 2022-02-22T21:44:44.440+0000

  • Duration: 154 min 31 sec

Test stats 🧪

Test Results
Failed 0
Passed 37896
Skipped 3327
Total 41223

💚 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!)

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Feb 7, 2022

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

v1v
v1v reviewed Feb 8, 2022
View reviewed changes
v1v
v1v reviewed Feb 8, 2022
View reviewed changes
x-pack/elastic-agent/README.md Outdated
for the standard variant. No newline at end of file
for the standard variant.

### Testing Elastic Agent on Kubernetes
Copy link
Copy Markdown
Member

@v1v v1v Feb 8, 2022

Choose a reason for hiding this comment

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

This is coming from #28697

v1v
v1v reviewed Feb 8, 2022
View reviewed changes
filebeat/_meta/test/docs/testing.md Outdated
@@ -0,0 +1,55 @@
# Testing Filebeat
Copy link
Copy Markdown
Member

@v1v v1v Feb 8, 2022

Choose a reason for hiding this comment

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

This is coming from #28670

@v1v v1v removed the conflicts There is a conflict in the backported pull request label Feb 8, 2022
v1v
v1v reviewed Feb 8, 2022
View reviewed changes
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Feb 9, 2022

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.0/pr-29710 upstream/mergify/bp/8.0/pr-29710
git merge upstream/8.0
git push upstream mergify/bp/8.0/pr-29710

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Feb 14, 2022

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

1 similar comment
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Feb 21, 2022

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

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Feb 28, 2022

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

@v1v v1v merged commit 3fa745d into 8.0 Mar 1, 2022
@mergify mergify bot deleted the mergify/bp/8.0/pr-29710 branch March 1, 2022 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@v1v v1v v1v left review comments

Assignees

@v1v v1v

Labels

backport Team:Automation Label for the Observability productivity team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @v1v