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

[7.x](backport #1377) chore(ci): propagate downstream build result to upstream#1379

Closed
mergify[bot] wants to merge 1 commit into7.xfrom
mergify/bp/7.x/pr-1377
Closed

[7.x](backport #1377) chore(ci): propagate downstream build result to upstream#1379
mergify[bot] wants to merge 1 commit into7.xfrom
mergify/bp/7.x/pr-1377

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jul 27, 2021

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

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

You are currently cherry-picking commit 8605153.
  (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/e2eKibana.groovy
	modified:   .ci/e2eTestingFleetDaily.groovy
	modified:   .ci/e2eTestingHelmDaily.groovy
	modified:   .ci/e2eTestingIntegrationsDaily.groovy

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .ci/e2eTestingK8SAutodiscoveryDaily.groovy

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.io/

(cherry picked from commit 8605153)

# Conflicts:
#	.ci/e2eTestingK8SAutodiscoveryDaily.groovy
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Jul 27, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

💚 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-07-27T07:29:59.398+0000

  • Duration: 36 min 16 sec

  • Commit: 9e49c30

Test stats 🧪

Test Results
Failed 0
Passed 230
Skipped 0
Total 230

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 230
Skipped 0
Total 230

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jul 27, 2021

This pull request is now in conflict. Could you fix it @mergify[bot]? 🙏
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.x/pr-1377 upstream/mergify/bp/7.x/pr-1377
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-1377

@mdelapenya
Copy link
Copy Markdown
Contributor

Superseded by #1384

@mdelapenya mdelapenya closed this Jul 27, 2021
@mergify mergify Bot deleted the mergify/bp/7.x/pr-1377 branch July 27, 2021 10:11
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

conflicts There is a conflict in the backported pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants