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 #32937) ci: enable windows for testing heartbeat #32962

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 1, 2022

This is an automatic backport of pull request #32937 done by Mergify.
Cherry-pick of 8552e34 has failed:

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

You are currently cherry-picking commit 8552e34a6a.
  (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:   x-pack/heartbeat/monitors/browser/source/inline.go
	modified:   x-pack/heartbeat/monitors/browser/source/inline_test.go
	modified:   x-pack/heartbeat/monitors/browser/source/local.go
	modified:   x-pack/heartbeat/monitors/browser/source/local_test.go
	modified:   x-pack/heartbeat/monitors/browser/source/offline.go
	modified:   x-pack/heartbeat/monitors/browser/source/validatepackage.go
	modified:   x-pack/heartbeat/monitors/browser/source/validatepackage_test.go
	modified:   x-pack/heartbeat/monitors/browser/source/zipurl.go
	modified:   x-pack/heartbeat/monitors/browser/source/zipurl_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   x-pack/heartbeat/Jenkinsfile.yml
	deleted by us:   x-pack/heartbeat/monitors/browser/source/project.go
	deleted by us:   x-pack/heartbeat/monitors/browser/source/project_test.go
	both modified:   x-pack/heartbeat/monitors/browser/source/source.go
	deleted by us:   x-pack/heartbeat/scenarios/basics_test.go
	deleted by us:   x-pack/heartbeat/scenarios/scenarios.go

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 8552e34)

# Conflicts:
#	x-pack/heartbeat/Jenkinsfile.yml
#	x-pack/heartbeat/monitors/browser/source/project.go
#	x-pack/heartbeat/monitors/browser/source/project_test.go
#	x-pack/heartbeat/monitors/browser/source/source.go
#	x-pack/heartbeat/scenarios/basics_test.go
#	x-pack/heartbeat/scenarios/scenarios.go
@mergify mergify bot requested a review from a team as a code owner September 1, 2022 17:23
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 1, 2022
@mergify mergify bot assigned v1v Sep 1, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 1, 2022
@elasticmachine
Copy link
Collaborator

💔 Build Failed

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-09-01T17:23:49.285+0000

  • Duration: 8 min 41 sec

Steps errors 2

Expand to view the steps failures

Read yaml from files in the workspace or text.
  • Took 0 min 0 sec . View more details here
  • Description: x-pack/heartbeat/Jenkinsfile.yml
Error signal
  • Took 0 min 0 sec . View more details here
  • Description: Error 'while scanning a simple key in 'reader', line 35, column 1: <<<<<<< HEAD ^could not find expected ':' in 'reader', line 36, column 1: # TODO: there are windows test f ... ^'

❕ Flaky test report

No test was executed to be analysed.

🤖 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 Sep 1, 2022

@andrewvc , this backport caused some conflicts, what do we do? Some files don't even exist in 7.17

@mergify
Copy link
Contributor Author

mergify bot commented Sep 5, 2022

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

@mtojek mtojek added the Team:obs-ds-hosted-services Label for the Observability Hosted Services team label Sep 5, 2022
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 5, 2022
@elasticmachine
Copy link
Collaborator

Pinging @elastic/uptime (Team:Uptime)

@v1v v1v closed this Sep 7, 2022
@mergify mergify bot deleted the mergify/bp/7.17/pr-32937 branch September 7, 2022 09:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request Team:obs-ds-hosted-services Label for the Observability Hosted Services team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants