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.

Sign up for GitHub

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

Jump to bottom

Fix some issues with versioning of uwsgi in tests #16316

Merged
merged 4 commits into from
Feb 18, 2020
Merged

Fix some issues with versioning of uwsgi in tests #16316

merged 4 commits into from
Feb 18, 2020

Conversation

jsoriano
Copy link
Member

What does this PR do?

  • Actually use the build arguments in the docker file
  • Add build argument for the UWSGI version
  • Add supported-versions.yml
  • Reuse service definition in docker-compose.yml

Why is it important?

  • Fix version used in testing for uwsgi
  • Reduce some code duplication

@jsoriano jsoriano requested a review from a team as a code owner February 13, 2020 18:40
@jsoriano jsoriano self-assigned this Feb 13, 2020
mdelapenya
mdelapenya reviewed Feb 13, 2020
View reviewed changes
metricbeat/module/uwsgi/docker-compose.yml
ports:
- 9192
extends:
service: uwsgi_tcp
Copy link
Contributor

Choose a reason for hiding this comment

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

Sweet! 🍬

@jsoriano jsoriano added the Team:Services (Deprecated) Label for the former Integrations-Services team label Feb 13, 2020
@jsoriano jsoriano mentioned this pull request Feb 13, 2020
Closed
@jsoriano jsoriano added needs_backport PR is waiting to be backported to other branches. v7.7.0 labels Feb 17, 2020
@jsoriano jsoriano added the Team:Integrations Label for the Integrations team label Feb 18, 2020
blakerouse
blakerouse approved these changes Feb 18, 2020
View reviewed changes
Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

lgtm!

@jsoriano jsoriano merged commit 34d0c35 into elastic:master Feb 18, 2020
@jsoriano jsoriano deleted the uwsgi-docker-tests branch February 18, 2020 18:41
jsoriano added a commit to jsoriano/beats that referenced this pull request Feb 18, 2020
@jsoriano
Fix some issues with versioning of uwsgi in tests (elastic#16316)
b0672f5 
Actually use the build arguments in the docker file
Add build argument for the UWSGI version
Add supported-versions.yml
Reuse service definition in docker-compose.yml

(cherry picked from commit 34d0c35)
@jsoriano jsoriano mentioned this pull request Feb 18, 2020
Merged
@jsoriano jsoriano removed the needs_backport PR is waiting to be backported to other branches. label Feb 18, 2020
jsoriano added a commit that referenced this pull request Feb 19, 2020
@jsoriano
Fix some issues with versioning of uwsgi in tests (#16316) (#16394)
85f6f66 
Actually use the build arguments in the docker file
Add build argument for the UWSGI version
Add supported-versions.yml
Reuse service definition in docker-compose.yml

(cherry picked from commit 34d0c35)
kvch pushed a commit to kvch/beats that referenced this pull request Feb 20, 2020
@jsoriano @kvch
Fix some issues with versioning of uwsgi in tests (elastic#16316)
918e308 
Actually use the build arguments in the docker file
Add build argument for the UWSGI version
Add supported-versions.yml
Reuse service definition in docker-compose.yml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mdelapenya mdelapenya mdelapenya approved these changes

@blakerouse blakerouse blakerouse approved these changes

Assignees

@jsoriano jsoriano

Labels
refactoring review Team:Integrations Label for the Integrations team Team:Services (Deprecated) Label for the former Integrations-Services team :Testing v7.7.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jsoriano @mdelapenya @blakerouse @andresrc