Skip to content

docker-tests: use docker from the system#4478

Merged
xrmx merged 13 commits into
open-telemetry:mainfrom
xrmx:drop-docker-dependency-from-docker-tests
May 9, 2026
Merged

docker-tests: use docker from the system#4478
xrmx merged 13 commits into
open-telemetry:mainfrom
xrmx:drop-docker-dependency-from-docker-tests

Conversation

@xrmx

@xrmx xrmx commented Apr 22, 2026

Copy link
Copy Markdown
Contributor

Description

Stop using the ancient docker-compose and docker packaged in Python and rely on the one available in the system.

Fixes #4477

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Test A

Does This PR Require a Core Repo Change?

  • Yes. - Link to PR:
  • No.

Checklist:

See contributing.md for styleguide, changelog guidelines, and more.

  • Followed the style guidelines of this project
  • Changelogs have been updated
  • Unit tests have been added
  • Documentation has been updated

Comment thread tox.ini Outdated
Comment thread tox.ini Outdated
@github-actions

github-actions Bot commented May 7, 2026

Copy link
Copy Markdown

This PR has been automatically marked as stale because it has not had any activity for 14 days. It will be closed if no further activity occurs within 14 days of this comment.
If you're still working on this, please add a comment or push new commits.

@github-actions github-actions Bot added the Stale label May 7, 2026
Comment thread tox.ini Outdated
@github-actions github-actions Bot removed the Stale label May 8, 2026
@xrmx
xrmx force-pushed the drop-docker-dependency-from-docker-tests branch from 574b0b1 to ac6061d Compare May 8, 2026 13:36
@xrmx
xrmx marked this pull request as ready for review May 8, 2026 13:38
@xrmx
xrmx requested a review from a team as a code owner May 8, 2026 13:38
@xrmx xrmx moved this to Ready for review in Python PR digest May 8, 2026
xrmx added 8 commits May 8, 2026 15:44
Stop using the ancient docker-compose and docker packaged in Python and
rely on the one available in the system.
And make ms sql odbc driver optional so you can run tests locally
without accepting the EULA.
@xrmx
xrmx force-pushed the drop-docker-dependency-from-docker-tests branch from 4e53e83 to 61b151c Compare May 8, 2026 13:44
Comment thread .github/workflows/generate_workflows_lib/src/generate_workflows_lib/misc.yml.j2 Outdated
Comment thread .github/workflows/misc.yml Outdated
Comment thread tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_mssql.py Outdated
Co-authored-by: Riccardo Magliocchetti <[email protected]>
@github-project-automation github-project-automation Bot moved this from Ready for review to Approved PRs in Python PR digest May 8, 2026
Comment thread tox.ini Outdated
Comment thread tox.ini Outdated
Comment thread tox.ini Outdated
Comment thread tox.ini Outdated
Comment thread tox.ini Outdated
Co-authored-by: Riccardo Magliocchetti <[email protected]>
Comment thread CHANGELOG.md Outdated
@xrmx
xrmx enabled auto-merge (squash) May 9, 2026 16:46
@xrmx xrmx moved this from Approved PRs to Ready for merge in Python PR digest May 9, 2026
Comment thread tox.ini Outdated
Comment thread tox.ini Outdated
Co-authored-by: Riccardo Magliocchetti <[email protected]>
@xrmx
xrmx disabled auto-merge May 9, 2026 16:51
@xrmx
xrmx merged commit 23ac232 into open-telemetry:main May 9, 2026
753 checks passed
@github-project-automation github-project-automation Bot moved this from Ready for merge to Done in Python PR digest May 9, 2026
Fiery-Fenix pushed a commit to Fiery-Fenix/opentelemetry-python-contrib that referenced this pull request May 13, 2026
* docker-tests: use docker from the system

Stop using the ancient docker-compose and docker packaged in Python and
rely on the one available in the system.

* Add missing -y to docker install

* This now requires docker

* it's not additive

* Drop version from docker-compose.yml

* Move system dependencies intall to workflow

And make ms sql odbc driver optional so you can run tests locally
without accepting the EULA.

* Add changelog

* Rebuild misc.yml manually

* Apply suggestions from code review

Co-authored-by: Riccardo Magliocchetti <[email protected]>

* Apply suggestions from code review

Co-authored-by: Riccardo Magliocchetti <[email protected]>

* Apply suggestion from @xrmx

* Apply suggestions from code review

Co-authored-by: Riccardo Magliocchetti <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Require docker on the machine in docker-tests

4 participants