Skip to content

[7.17] Fix Python systems tests with forked docker-compose package#38743

Merged
cmacknz merged 3 commits intoelastic:7.17from
cmacknz:fix-python-system-tests
Apr 5, 2024
Merged

[7.17] Fix Python systems tests with forked docker-compose package#38743
cmacknz merged 3 commits intoelastic:7.17from
cmacknz:fix-python-system-tests

Conversation

@cmacknz
Copy link
Copy Markdown
Member

@cmacknz cmacknz commented Apr 5, 2024

This is a manual backport of the fix for the Python systems tests contained in #38199, which uses a fork of the docker-compose Python package as a work around.

@cmacknz cmacknz added the Team:Elastic-Agent Label for the Agent team label Apr 5, 2024
@cmacknz cmacknz requested a review from pkoutsovasilis April 5, 2024 15:03
@cmacknz cmacknz self-assigned this Apr 5, 2024
@cmacknz cmacknz requested a review from a team as a code owner April 5, 2024 15:03
@cmacknz cmacknz requested review from belimawr and leehinman and removed request for a team April 5, 2024 15:03
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 5, 2024

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Apr 5, 2024
@cmacknz cmacknz added the backport-v8.13.0 Automated backport with mergify label Apr 5, 2024
@cmacknz cmacknz mentioned this pull request Apr 5, 2024
Merged
7 tasks
@cmacknz cmacknz enabled auto-merge (squash) April 5, 2024 15:43
pkoutsovasilis
pkoutsovasilis reviewed Apr 5, 2024
View reviewed changes
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Apr 5, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b fix-python-system-tests upstream/fix-python-system-tests
git merge upstream/7.17
git push upstream fix-python-system-tests

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 5, 2024 •
edited
Loading

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Duration: 135 min 10 sec

Pipeline error 1

This error is likely related to the pipeline itself. Click here
and then you will see the error (either incorrect syntax or an invalid configuration).

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@cmacknz
Copy link
Copy Markdown
Member Author

cmacknz commented Apr 5, 2024

The test failed but not with the errors this change fixes, force merging.

@cmacknz cmacknz disabled auto-merge April 5, 2024 19:56
@cmacknz cmacknz merged commit 33b776a into elastic:7.17 Apr 5, 2024
@cmacknz cmacknz deleted the fix-python-system-tests branch April 5, 2024 19:56
mergify bot pushed a commit that referenced this pull request Apr 5, 2024
@cmacknz @mergify
[7.17] Fix Python systems tests with forked docker-compose package (#…
4d56aeb 
…38743)

* Manual port of docker CI fix from #38199

* Fix order in requirements.txt.

(cherry picked from commit 33b776a)

# Conflicts:
#	libbeat/tests/system/requirements.txt
#	libbeat/tests/system/requirements_aix.txt
#	metricbeat/Dockerfile
@mergify mergify bot mentioned this pull request Apr 5, 2024
Merged
@pkoutsovasilis
Copy link
Copy Markdown
Contributor

pkoutsovasilis commented Apr 5, 2024

The test failed but not with the errors this change fixes, force merging.

maybe we forgot to backport something here (not related to the docker fix), I will take a look.

@cmacknz
Copy link
Copy Markdown
Member Author

cmacknz commented Apr 5, 2024

#38664 is one of them

@cmacknz
Copy link
Copy Markdown
Member Author

cmacknz commented Apr 5, 2024

The other was https://beats-ci.elastic.co/job/Beats/job/beats/job/PR-38743/3/testReport/junit/metricbeat.module.prometheus.test_prometheus/TestRemoteWrite/Build_Test___metricbeat_pythonIntegTest___test_remote_write/

        if network_mode == 'host' and port_bindings:
>           raise host_config_incompatible_error(
                'network_mode', 'host', 'port_bindings'
            )
E           docker.errors.InvalidArgument: "host" network_mode is incompatible with port_bindings

/opt/venv/lib/python3.11/site-packages/docker/types/containers.py:337: InvalidArgument

That I'm pretty sure I haven't seen before.

pierrehilbert pushed a commit that referenced this pull request Apr 7, 2024
@mergify @cmacknz
[8.13](backport #38743) [7.17] Fix Python systems tests with forked d…
cbcfef6 
…ocker-compose package (#38746)

* [7.17] Fix Python systems tests with forked docker-compose package (#38743)

* Manual port of docker CI fix from #38199

* Fix order in requirements.txt.

(cherry picked from commit 33b776a)

# Conflicts:
#	libbeat/tests/system/requirements.txt
#	libbeat/tests/system/requirements_aix.txt
#	metricbeat/Dockerfile

* Resolve conflicts

* Restore uintentionally removed packages

* Remove duplicate package.

* Add dropped docker copy

---------

Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
@cmacknz cmacknz added the backport-v8.12.0 Automated backport with mergify label Apr 8, 2024
mergify bot pushed a commit that referenced this pull request Apr 8, 2024
@cmacknz @mergify
[7.17] Fix Python systems tests with forked docker-compose package (#…
6770af0 
…38743)

* Manual port of docker CI fix from #38199

* Fix order in requirements.txt.

(cherry picked from commit 33b776a)

# Conflicts:
#	libbeat/tests/system/requirements.txt
#	libbeat/tests/system/requirements_aix.txt
#	metricbeat/Dockerfile
@mergify mergify bot mentioned this pull request Apr 8, 2024
Closed
@cmacknz cmacknz mentioned this pull request Apr 12, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@belimawr belimawr belimawr approved these changes

@pierrehilbert pierrehilbert pierrehilbert approved these changes

@leehinman leehinman Awaiting requested review from leehinman leehinman is a code owner automatically assigned from elastic/elastic-agent-data-plane

+1 more reviewer

@pkoutsovasilis pkoutsovasilis pkoutsovasilis left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@cmacknz cmacknz

Labels

backport-v8.12.0 Automated backport with mergify backport-v8.13.0 Automated backport with mergify Team:Elastic-Agent Label for the Agent team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@cmacknz @elasticmachine @pkoutsovasilis @belimawr @pierrehilbert