Skip to content

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

Merged
pierrehilbert merged 5 commits into8.13from
mergify/bp/8.13/pr-38743
Apr 7, 2024
Merged

[8.13](backport #38743) [7.17] Fix Python systems tests with forked docker-compose package#38746
pierrehilbert merged 5 commits into8.13from
mergify/bp/8.13/pr-38743

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Apr 5, 2024 •
edited by zube bot
Loading

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.

This is an automatic backport of pull request #38743 done by Mergify.

@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 requested a review from a team as a code owner April 5, 2024 19:57
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 5, 2024
@mergify mergify bot requested review from fearful-symmetry and leehinman and removed request for a team April 5, 2024 19:57
@mergify mergify bot assigned cmacknz Apr 5, 2024
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 5, 2024

Cherry-pick of 33b776a has failed:

On branch mergify/bp/8.13/pr-38743
Your branch is up to date with 'origin/8.13'.

You are currently cherry-picking commit 33b776a1b9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/tests/system/requirements.txt
	both modified:   libbeat/tests/system/requirements_aix.txt
	both modified:   metricbeat/Dockerfile

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 5, 2024
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 5, 2024 •
edited
Loading

💚 Build Succeeded

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: 146 min 26 sec

❕ 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!)

pkoutsovasilis
pkoutsovasilis reviewed Apr 5, 2024
View reviewed changes
@pierrehilbert pierrehilbert added the Team:Elastic-Agent Label for the Agent team label Apr 7, 2024
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 7, 2024

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 7, 2024
@pierrehilbert pierrehilbert merged commit cbcfef6 into 8.13 Apr 7, 2024
@pierrehilbert pierrehilbert deleted the mergify/bp/8.13/pr-38743 branch April 7, 2024 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pierrehilbert pierrehilbert pierrehilbert approved these changes

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

@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 conflicts There is a conflict in the backported pull request Team:Elastic-Agent Label for the Agent team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@elasticmachine @pierrehilbert @pkoutsovasilis @cmacknz