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

[Heartbeat] Fix packaging #20566

Merged
merged 3 commits into from
Aug 12, 2020
Merged

Conversation

andrewkroh
Copy link
Member

@andrewkroh andrewkroh commented Aug 11, 2020

What does this PR do?

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).

Why is it important?

This should allow builds and packaging from x-pack/heartbeat to work as expected.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Author's Checklist

This was a fast fix so please try it out yourself and examine the package contents.

There were a few issues with the package target for x-pack/heartbeat.
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 11, 2020
@andrewkroh
Copy link
Member Author

/package

@andrewkroh andrewkroh marked this pull request as ready for review August 11, 2020 21:39
@andrewkroh andrewkroh requested review from a team as code owners August 11, 2020 21:39
@botelastic botelastic bot added Team:Automation Label for the Observability productivity team and removed needs_team Indicates that the issue/PR needs a Team:* label labels Aug 11, 2020
@andrewkroh
Copy link
Member Author

/package

@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 11, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #20566 updated]

  • Start Time: 2020-08-12T01:11:54.127+0000

  • Duration: 58 min 2 sec

Test stats 🧪

Test Results
Failed 0
Passed 1200
Skipped 28
Total 1228

@andrewkroh
Copy link
Member Author

The packaging build passed, but I forgot a Makefile in x-pack/heartbeat so lint failed. I pushed an update so I think it should be good now.

Copy link
Contributor

@andrewvc andrewvc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM WFG

@andrewkroh
Copy link
Member Author

Looks better now. In a follow up I will add x-pack/heartbeat to the Jenkinfile so that it built and tested along with everything else.

@andrewkroh andrewkroh merged commit ca4ad77 into elastic:master Aug 12, 2020
@jsoriano jsoriano added needs_backport PR is waiting to be backported to other branches. v7.10.0 labels Aug 12, 2020
@jsoriano
Copy link
Member

This PR will need to be backported to 7.x along with #20549 when #20488 is merged.

v1v added a commit to v1v/beats that referenced this pull request Aug 12, 2020
…ne-2.0

* upstream/master: (39 commits)
  [ITs] Revert healthcheck for elasticsearchssl service to the previous behaviour (elastic#20558)
  [Heartbeat] Fix packaging (elastic#20566)
  [Heartbeat] Add Magefile to X-Pack (elastic#20549)
  [Packetbeat] Add "network" to event.category (elastic#20392)
  fix typo in docs (elastic#20541)
  Add service resource in k8s cluster role (elastic#20546)
  Update Golang version to 1.14.7 (elastic#20508)
  Add missing inputs to filebeat spec (elastic#20388)
  add warning log in aws and googlecloud module for API cost (elastic#20523)
  Fix fortinet.firewall.mem value to be interpreted as integer (elastic#19335)
  [CI] add more resilience (elastic#20505)
  [JJBB] fix credentials with a service account for golang-crossbuild (elastic#20537)
  [ITs] change healthcheck for elasticsearch (elastic#20514)
  [JJBB] fix credentials with a service account (elastic#20535)
  chore(ci): use build step for checking if is PR (elastic#20536)
  [CI] runbld project name (elastic#20466)
  Add panw.panos.endreason field (elastic#18705)
  [Filebeat] Fix PANW field spelling "veredict" to "verdict" (elastic#18808)
  Fix typo in netflow module docs (elastic#18992)
  Modified auditd ingest pipeline to handle node=hostname (elastic#19659)
  ...
andrewvc pushed a commit to andrewvc/beats that referenced this pull request 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
Copy link
Contributor

backport here #20638

andrewvc added a commit that referenced this pull request Aug 18, 2020
… to X-Pack (#20638)


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.
melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 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
@andrewkroh andrewkroh removed the needs_backport PR is waiting to be backported to other branches. label Dec 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Heartbeat :Packaging Team:Automation Label for the Observability productivity team v7.10.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants