Skip to content

[Heartbeat] Fix broken invocation of synth package (backport #26228)#26250

Merged
andrewvc merged 5 commits into7.xfrom
mergify/bp/7.x/pr-26228
Jul 27, 2021
Merged

[Heartbeat] Fix broken invocation of synth package (backport #26228)#26250
andrewvc merged 5 commits into7.xfrom
mergify/bp/7.x/pr-26228

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 10, 2021

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

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

You are currently cherry-picking commit ad7c19fdc.
  (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/synthexec/synthexec.go
	modified:   x-pack/heartbeat/monitors/browser/synthexec/synthexec_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x-pack/heartbeat/monitors/browser/source/validatepackage.go
	deleted by us:   x-pack/heartbeat/monitors/browser/source/validatepackage_test.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/

@andrewvc
[Heartbeat] Fix broken invocation of synth package (#26228)
28744fc 
Fixes invocation of synthetics broken in #26188

Additionally, for dev purposes, this lets accepts a synthetics version of file:/// as valid to help with debugging development versions of the synthetics agent.

Never released, so no changelog needed

Still just sticking with unit tests here since testing more deeply with synthetics (esp. master where this is a problem) is a larger problem than we're equipped to handle ATM.

(cherry picked from commit ad7c19f)

# Conflicts:
#	x-pack/heartbeat/monitors/browser/source/validatepackage.go
#	x-pack/heartbeat/monitors/browser/source/validatepackage_test.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 10, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 10, 2021
@mergify mergify bot mentioned this pull request Jun 10, 2021
Merged
3 tasks
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 10, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 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-27T18:02:42.522+0000

  • Duration: 42 min 18 sec

  • Commit: c7be018

Test stats 🧪

Test Results
Failed 0
Passed 88
Skipped 0
Total 88

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 88
Skipped 0
Total 88

@jsoriano jsoriano added the Team:obs-ds-hosted-services Label for the Observability Hosted Services team label Jun 24, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 24, 2021

Pinging @elastic/uptime (Team:Uptime)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 24, 2021
@jsoriano
Copy link
Copy Markdown
Member

jsoriano commented Jun 24, 2021

/test

@andrewvc
Copy link
Copy Markdown
Contributor

andrewvc commented Jul 22, 2021

@Mergifyio backport 7.14

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jul 22, 2021

Command backport 7.14: pending

Waiting for the pull request to get merged

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jul 22, 2021

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.x/pr-26228 upstream/mergify/bp/7.x/pr-26228
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-26228

@andrewvc
Copy link
Copy Markdown
Contributor

andrewvc commented Jul 27, 2021

/test

@andrewvc andrewvc merged commit 5f49358 into 7.x Jul 27, 2021
@andrewvc andrewvc deleted the mergify/bp/7.x/pr-26228 branch July 27, 2021 19:55
@andrewvc
Copy link
Copy Markdown
Contributor

andrewvc commented Jul 27, 2021

@Mergifyio backport 7.14

mergify bot added a commit that referenced this pull request Jul 27, 2021
@mergify @andrewvc
[Heartbeat] Fix broken invocation of synth package (backport #26228) (#…
86cb447 
…26250)

* [Heartbeat] Fix broken invocation of synth package (#26228)

Fixes invocation of synthetics broken in #26188

Additionally, for dev purposes, this lets accepts a synthetics version of file:/// as valid to help with debugging development versions of the synthetics agent.

Never released, so no changelog needed

Still just sticking with unit tests here since testing more deeply with synthetics (esp. master where this is a problem) is a larger problem than we're equipped to handle ATM.

(cherry picked from commit ad7c19f)

# Conflicts:
#	x-pack/heartbeat/monitors/browser/source/validatepackage.go
#	x-pack/heartbeat/monitors/browser/source/validatepackage_test.go

* Fix license

* Fix notice

Co-authored-by: Andrew Cholakian <andrew@andrewvc.com>
(cherry picked from commit 5f49358)
@mergify mergify bot mentioned this pull request Jul 27, 2021
Merged
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jul 27, 2021

Command backport 7.14: success

Backports have been created

1 similar comment
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jul 27, 2021

Command backport 7.14: success

Backports have been created

andrewvc pushed a commit that referenced this pull request Jul 27, 2021
@mergify
[Heartbeat] Fix broken invocation of synth package (backport #26228) (#…
b051860 
…26250) (#27083)

* [Heartbeat] Fix broken invocation of synth package (#26228)

Fixes invocation of synthetics broken in #26188

Additionally, for dev purposes, this lets accepts a synthetics version of file:/// as valid to help with debugging development versions of the synthetics agent.

Never released, so no changelog needed

Still just sticking with unit tests here since testing more deeply with synthetics (esp. master where this is a problem) is a larger problem than we're equipped to handle ATM.

(cherry picked from commit ad7c19f)

# Conflicts:
#	x-pack/heartbeat/monitors/browser/source/validatepackage.go
#	x-pack/heartbeat/monitors/browser/source/validatepackage_test.go

* Fix license

* Fix notice

Co-authored-by: Andrew Cholakian <andrew@andrewvc.com>
(cherry picked from commit 5f49358)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@andrewvc andrewvc

Labels

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @jsoriano @andrewvc