Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

[8.0](backport #1928) Update main branch #1931

Merged
merged 2 commits into from
Dec 20, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 20, 2021

This is an automatic backport of pull request #1928 done by Mergify.
Cherry-pick of 304c97f has failed:

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

You are currently cherry-picking commit 304c97f.
  (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/Jenkinsfile
	modified:   .ci/build-docker-images.groovy
	modified:   .ci/e2eFleetServer.groovy
	modified:   .ci/e2eKibana.groovy
	modified:   .ci/jobs/build-docker-images.yml
	modified:   .ci/jobs/fleet-server-e2e-tests.yml
	modified:   .ci/jobs/kibana-e2e-tests.yml
	modified:   README.md
	modified:   cli/README.md
	modified:   e2e/README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/jobs/e2e-testing-fleet-daily-mbp.yml
	both modified:   .ci/jobs/e2e-testing-helm-daily-mbp.yml
	both modified:   .ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml
	both modified:   .ci/jobs/e2e-testing-mbp.yml
	both modified:   .mergify.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 304c97f)

# Conflicts:
#	.ci/jobs/e2e-testing-fleet-daily-mbp.yml
#	.ci/jobs/e2e-testing-helm-daily-mbp.yml
#	.ci/jobs/e2e-testing-k8s-autodiscovery-daily-mbp.yml
#	.ci/jobs/e2e-testing-mbp.yml
#	.mergify.yml
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Dec 20, 2021
@mergify mergify bot assigned v1v Dec 20, 2021
@mdelapenya mdelapenya removed the conflicts There is a conflict in the backported pull request label Dec 20, 2021
@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 20, 2021

💚 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: 2021-12-20T11:04:41.306+0000

  • Duration: 34 min 38 sec

  • Commit: ac7e6a0

Test stats 🧪

Test Results
Failed 0
Passed 216
Skipped 0
Total 216

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@mdelapenya mdelapenya merged commit 6c98999 into 8.0 Dec 20, 2021
@mergify mergify bot deleted the mergify/bp/8.0/pr-1928 branch December 20, 2021 12:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants