Add helper to get hosts on Go Metricbeat integration tests#13055
Merged
jsoriano merged 38 commits intoelastic:masterfrom Aug 5, 2019
Merged
Add helper to get hosts on Go Metricbeat integration tests#13055jsoriano merged 38 commits intoelastic:masterfrom
jsoriano merged 38 commits intoelastic:masterfrom
Conversation
jsoriano
added
in progress
jsoriano
force-pushed
the
metricbeat-integration-tests-host
branch
from
04489a8 to
2d8cdaf
Compare
houndci-bot
reviewed
Jul 26, 2019
houndci-bot
reviewed
Jul 26, 2019
jsoriano
force-pushed
the
metricbeat-integration-tests-host
branch
5 times, most recently
from
5522efd to
a3ce2e2
Compare
houndci-bot
reviewed
Jul 29, 2019
houndci-bot
reviewed
Jul 29, 2019
houndci-bot
reviewed
Jul 29, 2019
Member
Author
|
jenkins, test this again please |
1 similar comment
Member
Author
|
jenkins, test this again please |
jsoriano
force-pushed
the
metricbeat-integration-tests-host
branch
from
f12a31b to
8284004
Compare
Member
Author
|
jenkins, test this again please |
jsoriano
force-pushed
the
metricbeat-integration-tests-host
branch
from
82ee7f4 to
e8941df
Compare
jsoriano
force-pushed
the
metricbeat-integration-tests-host
branch
from
1982ad0 to
b523145
Compare
jsoriano
added
[zube]: In Review
review
and removed
[zube]: In Progress
in progress
exekias
reviewed
Aug 1, 2019
Contributor
exekias
left a comment
exekias
left a comment
There was a problem hiding this comment.
This is a great enabler! did a first pass and left some questions, I will look into it more tomorrow
|
|
||
| // EnsureUpWithTimeout starts all the requested services (must be defined in docker-compose.yml) | ||
| // Wait for `timeout` seconds for health | ||
| func EnsureUpWithTimeout(t *testing.T, timeout int, services ...string) { |
Contributor
There was a problem hiding this comment.
what’s the reason to accept only one service? not saying it’s a bad idea, just want to know the reasoning
Member
Author
There was a problem hiding this comment.
There are two main reasons:
- It simplifies the returned information. With an only service, only an object with the host information for a service is returned.
- It doesn't seem to be needed, we only had an scenario with two services (Kibana, that also needs Elasticsearch), and it can also be done with docker compose dependencies. If access to both hosts were needed, we could have two
EnsureUp.
If wouldn't be hard to implement it though, by returning a struct with all the services info and adding a method like HostForServicePort(service, port) HostInfo. But I didn't consider it neccessary by now.
Contributor
There was a problem hiding this comment.
That sounds good to me, thanks for the explanation!
exekias
approved these changes
Aug 2, 2019
Contributor
|
I'm happy if CI is happy |
Member
Author
|
jenkins, test this again please |
kaiyan-sheng
reviewed
Aug 2, 2019
|
|
||
| // Wait ensures all wanted services are healthy. Wait loop (60s timeout) | ||
| func (c *Project) Wait(seconds int, services ...string) error { | ||
| func (c *Project) Wait(seconds time.Duration, services ...string) error { |
Member
Author
|
CI is happy, we all are happy 🙂 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Takes from #13039 and #7957 the required changes to allow
Metricbeat integration tests to obtain the hosts of the containers
from the framework, instead of needing to use environment
variables and tricky setups. This allows to run integration tests
for specific modules with
go run -tags=integration, withoutprevious setup.
This is similar to the change introduced for python tests in #11925.
<SERVICE>_HOSTenvironment variable can be set to thehost:port of a running service to avoid using compose, similarly
to old
NO_COMPOSEenvironment variable.This PR modifies many files, but most of the relevant changes
are in libbeat, and in the metricbeat docker compose. In the docker
compose file,
envfiles are removed and metricbeat is run in the hostnetwork. The rest of changes are to adapt the integration tests to
don't depend on environment variables to get the hosts information.