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

Add x-pack/filebeat to Travis CI #9184

Merged

Conversation

andrewkroh
Copy link
Member

@andrewkroh andrewkroh commented Nov 20, 2018

This adds testing of x-pack/filebeat to travis CI. And includes x-pack/filebeat in the
top-level make check target.

In x-pack/filebeat I changed the integTest target to pre-build the Docker images to
avoid any timeouts in the EnsureUp() calls.

Bump the version of docker-compose on Travis to 1.22.0 the same as what's being used within
the Docker images that we build.

Add fmt and check to Mage. This adds a means to format code and check for modifications.
These targets behave as follows:

  • mage fmt - Adds license headers, run goimports, and run autopep8.
  • mage check - Runs fmt and update. Then checks to see if there were any modifications
    using git. And checks if any nosetests files or YAML files are executable.

@andrewkroh andrewkroh force-pushed the feature/xpack-filebeat-travis-ci branch from c6c660d to a4fb84e Compare November 20, 2018 22:25
@andrewkroh
Copy link
Member Author

@sayden I updated my copy of your mssql pull request to include these changes. And now your mssql stuff should be tested on travis too.

Branch: https://github.com/andrewkroh/beats/tree/sayden-mssql-update
Travis: https://travis-ci.org/andrewkroh/beats/builds/457683976

If you'd find it convenient I can clean up this branch and open a PR to add MSSQL to x-pack/metricbeat or can push an update to your PR.

This adds testing of x-pack/filebeat to travis CI. And includes x-pack/filebeat in the
top-level `make check` target.

In x-pack/filebeat I changed the integTest target to pre-build the Docker images to
avoid any timeouts in the EnsureUp() calls.

Bump the version of docker-compose on Travis to 1.22.0 the same as what's being used within
the Docker images that we build.

Add fmt and check to Mage. This adds a means to format code and check for modifications.
These targets behave as follows:

- `mage fmt` - Adds license headers, run goimports, and autopep8.
- `mage check` - Runs fmt and update. Then checks to see if there were any modifications
  using git. And checks if any nosetests files or YAML files are executable.
@andrewkroh andrewkroh force-pushed the feature/xpack-filebeat-travis-ci branch from a4fb84e to 1bfcf3c Compare November 20, 2018 23:32
ES_BEATS?=../..
XPACK_BEAT_PATH?=github.com/elastic/beats/x-pack/${BEAT_NAME}
GOPACKAGES?=$(shell go list ${BEAT_PATH}/... ${XPACK_BEAT_PATH}/... | grep -v /vendor/ | grep -v /scripts/cmd/ )
LICENSE=Elastic
Copy link
Member

Choose a reason for hiding this comment

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

Is the LICENSE part not needed anymore?

Copy link
Member Author

@andrewkroh andrewkroh Nov 21, 2018

Choose a reason for hiding this comment

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

It's not needed here because all of the real build logic originates from Mage in this case so we only need to set mage.BeatLicense = "Elastic" in the magefile.go.

Copy link
Member

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewkroh Would be great if you could contribute / help on the other branch too.

@andrewkroh andrewkroh merged commit 4471df5 into elastic:master Nov 21, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants