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

Support per-module docker compose files for metricbeat tests #13186

Merged
merged 14 commits into from Sep 19, 2019

Conversation

jsoriano
Copy link
Member

@jsoriano jsoriano commented Aug 7, 2019

Modify docker compose helpers so they can start scenarios
using different docker compose files, what will allow to define
docker compose scenarios per module.

Apache service definition is moved to its own docker compose
file.

Related to #12909

@jsoriano jsoriano added in progress Pull request is currently in progress. :Testing [zube]: In Progress Team:Integrations Label for the Integrations team labels Aug 7, 2019
@jsoriano jsoriano self-assigned this Aug 7, 2019
@jsoriano jsoriano changed the title Metricbeat test files to modules Support per-module docker compose files for metricbeat tests Aug 7, 2019
@jsoriano
Copy link
Member Author

jsoriano commented Aug 7, 2019

jenkins, test this again please

@jsoriano jsoriano force-pushed the metricbeat-test-files-to-modules branch 5 times, most recently from b0b2896 to 7587650 Compare August 13, 2019 09:28
@jsoriano jsoriano force-pushed the metricbeat-test-files-to-modules branch from 7587650 to 3b9f0fc Compare August 13, 2019 13:42
@jsoriano
Copy link
Member Author

jenkins, test this again please

@jsoriano
Copy link
Member Author

jenkins, test this again

@sayden
Copy link
Contributor

sayden commented Sep 16, 2019

This is really cool. Looking forward to give a review 👍

@jsoriano jsoriano marked this pull request as ready for review September 16, 2019 09:38
@jsoriano jsoriano requested a review from a team as a code owner September 16, 2019 09:38
@jsoriano
Copy link
Member Author

@sayden thanks! go for it, I have just opened this for review 🙂

@jsoriano jsoriano added [zube]: In Review review Metricbeat Metricbeat module and removed [zube]: In Progress in progress Pull request is currently in progress. labels Sep 16, 2019
project.up(
strategy=ConvergenceStrategy.always,
service_names=cls.COMPOSE_SERVICES,
do_build=BuildAction.force,
do_build=BuildAction.skip,
Copy link
Contributor

Choose a reason for hiding this comment

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

Are you sure about this change?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, after adding a explicit project.build it is not needed to build also in project.up. The reason to add an explicit project.build is that project.up doesn't allow to pass build arguments.

Copy link
Contributor

@sayden sayden left a comment

Choose a reason for hiding this comment

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

Just one comment. But looks ok

@jsoriano jsoriano merged commit 82380e0 into elastic:master Sep 19, 2019
@jsoriano jsoriano deleted the metricbeat-test-files-to-modules branch September 19, 2019 17:10
@urso urso added the v7.5.0 label Oct 22, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants