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

Cherry-pick #20549 #20566 and #20242 to 7.x: [Heartbeat] Add Magefile to X-Pack #20638

Merged
merged 9 commits into from
Aug 18, 2020

Conversation

andrewvc
Copy link
Contributor

@andrewvc andrewvc commented Aug 17, 2020

Cherry-pick of PR #20549, #20566, and #20242 to 7.x branch. Original message:

There were a few issues with the package target for x-pack/heartbeat.

Update root Makefile to build packages for x-pack/heartbeat.
Update packaging CI job.
Magefile fixes (mostly with where the packaging spec was looking for files).

This also restructures the main magefile to share code with the x-pack.

This fixes the broken agent build which is trying to run mage build in the x-pack heartbeat folder.

@andrewvc andrewvc requested a review from a team as a code owner August 17, 2020 15:53
@andrewvc andrewvc added [zube]: In Review backport Team:obs-ds-hosted-services Label for the Observability Hosted Services team labels Aug 17, 2020
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 17, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/uptime (Team:Uptime)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Aug 17, 2020
* Heartbeat packaging fixes

There were a few issues with the package target for x-pack/heartbeat.

* There are no integTests setup in x-pack/heartbeat

* Add make files
@andrewvc andrewvc changed the title Cherry-pick #20549 to 7.x: [Heartbeat] Add Magefile to X-Pack Cherry-pick #20549,#20566 to 7.x: [Heartbeat] Add Magefile to X-Pack Aug 17, 2020
@zube zube bot changed the title Cherry-pick #20549,#20566 to 7.x: [Heartbeat] Add Magefile to X-Pack Cherry-pick #20549 to 7.x: [Heartbeat] Add Magefile to X-Pack Aug 17, 2020
@andrewvc andrewvc changed the title Cherry-pick #20549 to 7.x: [Heartbeat] Add Magefile to X-Pack Cherry-pick #20549 and 20566 to 7.x: [Heartbeat] Add Magefile to X-Pack Aug 17, 2020
@zube zube bot changed the title Cherry-pick #20549 and 20566 to 7.x: [Heartbeat] Add Magefile to X-Pack Cherry-pick #20549 to 7.x: [Heartbeat] Add Magefile to X-Pack Aug 17, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 17, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [jsoriano commented: jenkins run the tests please]

  • Start Time: 2020-08-18T12:59:33.106+0000

  • Duration: 74 min 29 sec

Test stats 🧪

Test Results
Failed 0
Passed 14597
Skipped 1331
Total 15928

@andrewvc andrewvc changed the title Cherry-pick #20549 to 7.x: [Heartbeat] Add Magefile to X-Pack Cherry-pick #20549 #20566 to 7.x: [Heartbeat] Add Magefile to X-Pack Aug 17, 2020
@andrewvc andrewvc self-assigned this Aug 17, 2020
@andrewvc andrewvc mentioned this pull request Aug 17, 2020
6 tasks
@andrewkroh
Copy link
Member

/package

@andrewvc andrewvc changed the title Cherry-pick #20549 #20566 to 7.x: [Heartbeat] Add Magefile to X-Pack Cherry-pick #20549 #20566 and #20242 to 7.x: [Heartbeat] Add Magefile to X-Pack Aug 17, 2020
@andrewvc
Copy link
Contributor Author

/package

@jsoriano
Copy link
Member

/package

@jsoriano
Copy link
Member

jenkins run the tests please

@jsoriano
Copy link
Member

/package

@andrewvc andrewvc merged commit 90dd632 into elastic:7.x Aug 18, 2020
@andrewvc andrewvc deleted the backport_20549_7.x branch August 18, 2020 18:01
@zube zube bot added [zube]: Done and removed [zube]: Inbox labels Aug 18, 2020
@zube zube bot removed the [zube]: Done label Nov 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 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.

5 participants