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

[7.17](backport #32723) action: run check, check-default and pre-commit #32741

Merged
merged 5 commits into from
Aug 23, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 22, 2022

This is an automatic backport of pull request #32723 done by Mergify.
Cherry-pick of 1fa3f3d has failed:

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

You are currently cherry-picking commit 1fa3f3d0aa.
  (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-default.yml
	new file:   .github/workflows/check-docs.yml
	modified:   .github/workflows/opentelemetry.yml
	new file:   .github/workflows/pre-commit.yml

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

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 1fa3f3d)

# Conflicts:
#	Jenkinsfile
@mergify mergify bot requested a review from a team as a code owner August 22, 2022 13:25
@mergify mergify bot requested review from cmacknz and faec and removed request for a team August 22, 2022 13:25
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 22, 2022
@mergify mergify bot assigned v1v Aug 22, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 22, 2022
Jenkinsfile Outdated Show resolved Hide resolved
@v1v
Copy link
Member

v1v commented Aug 22, 2022

pre-commit was not backported to 7.17 so action is not needed

@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 22, 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-23T09:28:37.217+0000

  • Duration: 79 min 58 sec

Test stats 🧪

Test Results
Failed 0
Passed 22096
Skipped 1553
Total 23649

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

@v1v
Copy link
Member

v1v commented Aug 22, 2022

This PR on-hold until #32747 since some commits might need to be reverted

@mergify
Copy link
Contributor Author

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

@v1v v1v added automation Team:Automation Label for the Observability productivity team and removed conflicts There is a conflict in the backported pull request labels Aug 23, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 23, 2022
@v1v v1v merged commit 976b66f into 7.17 Aug 23, 2022
@mergify mergify bot deleted the mergify/bp/7.17/pr-32723 branch August 23, 2022 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation backport Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants