Skip to content

[7.17](backport #32753) action: checks for x-pack/osquerybeat#32796

Merged
v1v merged 3 commits into7.17from
mergify/bp/7.17/pr-32753
Aug 25, 2022
Merged

[7.17](backport #32753) action: checks for x-pack/osquerybeat#32796
v1v merged 3 commits into7.17from
mergify/bp/7.17/pr-32753

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 24, 2022

This is an automatic backport of pull request #32753 done by Mergify.
Cherry-pick of 690783f has failed:

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

You are currently cherry-picking commit 690783fc53.
  (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:
	new file:   .github/workflows/check-xpack-osquerybeat.yml
	modified:   .github/workflows/opentelemetry.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/osquerybeat/Jenkinsfile.yml

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

(cherry picked from commit 690783f)

# Conflicts:
#	x-pack/osquerybeat/Jenkinsfile.yml
@mergify mergify bot requested a review from a team as a code owner August 24, 2022 10:46
@mergify mergify bot requested review from belimawr and rdner and removed request for a team August 24, 2022 10:46
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 24, 2022
@mergify mergify bot assigned v1v Aug 24, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 24, 2022
@botelastic
Copy link

botelastic bot commented Aug 24, 2022

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Contributor

elasticmachine commented Aug 24, 2022

💚 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-08-25T08:42:33.436+0000

  • Duration: 55 min 46 sec

Test stats 🧪

Test Results
Failed 0
Passed 1046
Skipped 0
Total 1046

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

@rdner
Copy link
Member

rdner commented Aug 25, 2022

/test

@v1v v1v removed the conflicts There is a conflict in the backported pull request label Aug 25, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Aug 25, 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/7.17/pr-32753 upstream/mergify/bp/7.17/pr-32753
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-32753

@v1v v1v merged commit c5e25a6 into 7.17 Aug 25, 2022
@mergify mergify bot deleted the mergify/bp/7.17/pr-32753 branch August 25, 2022 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants