This repository was archived by the owner on Sep 17, 2024. It is now read-only.
fix: support selecting the platform in docker-compose#751
Merged
mdelapenya merged 5 commits intoelastic:masterfrom Feb 17, 2021
Merged
fix: support selecting the platform in docker-compose#751mdelapenya merged 5 commits intoelastic:masterfrom
mdelapenya merged 5 commits intoelastic:masterfrom
Conversation
Contributor
💔 Tests Failed
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪Test errors
Expand to view the tests failures
|
mdelapenya
commented
Feb 17, 2021
|
|
||
| profileEnv["elasticAgentContainerName"] = containerName | ||
| profileEnv["elasticAgentConfigFile"] = sats.AgentConfigFilePath | ||
| profileEnv["elasticAgentPlatform"] = "linux/amd64" |
Contributor
Author
There was a problem hiding this comment.
This value will be eventually dynamic for ARM/AMD
mdelapenya
commented
Feb 17, 2021
| } | ||
|
|
||
| env["metricbeatDockerNamespace"] = e2e.GetDockerNamespaceEnvVar() | ||
| env["metricbeatPlatform"] = "linux/amd64" |
Contributor
Author
There was a problem hiding this comment.
This value will be eventually dynamic for ARM/AMD
v1v
approved these changes
Feb 17, 2021
| return err | ||
| } | ||
|
|
||
| // sets version to 2.4 for testing purpose |
Member
There was a problem hiding this comment.
Not testing anymore?
Suggested change
| // sets version to 2.4 for testing purpose |
Contributor
Author
There was a problem hiding this comment.
Well, I mean testing the execution of the tests. I added there to explain why we are setting that version there. Maybe it's not clear enough and it could be deleted
kuisathaverat
approved these changes
Feb 17, 2021
Contributor
Author
|
The failed test could be considered flaky. Merging |
mdelapenya
added a commit
to mdelapenya/e2e-testing
that referenced
this pull request
Feb 17, 2021
* fix: support selecting the platform in docker-compose * fix: wrong interpolation format * fix: use a docker-compose version for platform * chore: bump all compose files to 2.4 * chore: sanitise Beats compose files to enforce 2.4 compose version
mdelapenya
added a commit
to mdelapenya/e2e-testing
that referenced
this pull request
Feb 17, 2021
* fix: support selecting the platform in docker-compose * fix: wrong interpolation format * fix: use a docker-compose version for platform * chore: bump all compose files to 2.4 * chore: sanitise Beats compose files to enforce 2.4 compose version
mdelapenya
added a commit
to mdelapenya/e2e-testing
that referenced
this pull request
Feb 17, 2021
* fix: support selecting the platform in docker-compose * fix: wrong interpolation format * fix: use a docker-compose version for platform * chore: bump all compose files to 2.4 * chore: sanitise Beats compose files to enforce 2.4 compose version
mdelapenya
added a commit
to mdelapenya/e2e-testing
that referenced
this pull request
Feb 17, 2021
* fix: support selecting the platform in docker-compose * fix: wrong interpolation format * fix: use a docker-compose version for platform * chore: bump all compose files to 2.4 * chore: sanitise Beats compose files to enforce 2.4 compose version
mdelapenya
added a commit
that referenced
this pull request
Feb 17, 2021
* fix: support selecting the platform in docker-compose * fix: wrong interpolation format * fix: use a docker-compose version for platform * chore: bump all compose files to 2.4 * chore: sanitise Beats compose files to enforce 2.4 compose version
mdelapenya
added a commit
that referenced
this pull request
Feb 17, 2021
* fix: support selecting the platform in docker-compose * fix: wrong interpolation format * fix: use a docker-compose version for platform * chore: bump all compose files to 2.4 * chore: sanitise Beats compose files to enforce 2.4 compose version
mdelapenya
added a commit
that referenced
this pull request
Feb 17, 2021
* fix: support selecting the platform in docker-compose * fix: wrong interpolation format * fix: use a docker-compose version for platform * chore: bump all compose files to 2.4 * chore: sanitise Beats compose files to enforce 2.4 compose version
mdelapenya
added a commit
that referenced
this pull request
Feb 17, 2021
* fix: support selecting the platform in docker-compose * fix: wrong interpolation format * fix: use a docker-compose version for platform * chore: bump all compose files to 2.4 * chore: sanitise Beats compose files to enforce 2.4 compose version
This was referenced Feb 18, 2021
8 tasks
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 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.
What does this PR do?
It adds the
platformelement to the docker-compose files for metricbeat and the elastic-agent, so that we will be able to target AMD64 or ARM64 (last one in the near future). This change forced us to upgrade compose files versions from 2.3 to 2.4, which is the version whereplatformattribute appeared.Because of that, all files in the execution must use the same version, so we are updating all compose files in consequence. And that means that when synchronising the Integrations from Beats, we must enforce the 2.4 version too.
Why is it important?
We want to make sure we consume the proper platform. After Beats creating ARM images, we need to make sure we consume the proper platform.
Checklist
make noticein the proper directory)Author's Checklist
How to test this PR locally
Related issues