Skip to content

[FLINK-38809][Tests] Upgrade Testcontainers to 2.0.3 #27341

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
Draft
MartijnVisser wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[FLINK-38809][Tests] Upgrade Testcontainers to 2.0.3 #27341

MartijnVisser wants to merge 2 commits into from

Conversation

@MartijnVisser
Copy link
Contributor

@MartijnVisser MartijnVisser commented Dec 15, 2025 •
edited
Loading

What is the purpose of the change

  • Update testcontainers to latest version (2.0.3) to avoid Docker API Client compatibility problems

Brief change log

  • Refactored flink-end-to-end-tests-common from JUnit4 to JUnit5. Created local ExternalResource interface to be fully JUnit5-compatible with minimum code changes.
  • Updated dependencies and imports

Verifying this change

This change is a trivial rework / code cleanup without any test coverage.

Does this pull request potentially affect one of the following parts:

  • Dependencies (does it add or upgrade a dependency): (yes / no)
  • The public API, i.e., is any changed class annotated with @Public(Evolving): (yes / no)
  • The serializers: (yes / no / don't know)
  • The runtime per-record code paths (performance sensitive): (yes / no / don't know)
  • Anything that affects deployment or recovery: JobManager (and its components), Checkpointing, Kubernetes/Yarn, ZooKeeper: (yes / no / don't know)
  • The S3 file system connector: (yes / no / don't know)

Documentation

  • Does this pull request introduce a new feature? (yes / no)
  • If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)

@flinkbot
Copy link
Collaborator

flinkbot commented Dec 15, 2025 •
edited
Loading

CI report:

Bot commands The @flinkbot bot supports the following commands:
  • @flinkbot run azure re-run the last Azure build

@gustavodemorais
Copy link
Contributor

gustavodemorais commented Dec 15, 2025

Did you test it locally? CI is failing with
10:59:29.860 [ERROR] /__w/1/s/flink-end-to-end-tests/flink-end-to-end-tests-common/src/main/java/org/apache/flink/tests/util/cache/LolCache.java:[21,23] package org.junit.rules does not exist

@MartijnVisser
Copy link
Contributor Author

MartijnVisser commented Dec 15, 2025

Did you test it locally?

Yes, and messed up my commits after I rebased incorrectly :) Should be working now. I did see some concerns raised that we'll run into http://github.com/testcontainers/testcontainers-java/issues/11236, but I guess we'll see what CI does

@MartijnVisser MartijnVisser marked this pull request as draft December 17, 2025 09:08
snuyanzin
snuyanzin reviewed Dec 18, 2025
View reviewed changes
pom.xml Outdated
<protoc.version>4.32.1</protoc.version>
<okhttp.version>3.14.9</okhttp.version>
<testcontainers.version>1.20.2</testcontainers.version>
<testcontainers.version>2.0.2</testcontainers.version>
Copy link
Contributor

@snuyanzin snuyanzin Dec 18, 2025

Choose a reason for hiding this comment

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

probably you need to consider 2.0.3 where they improved a bit compatibility testcontainers/testcontainers-java#11346

it will fix 2 failing jobs in your PR's CI

However still need to fix the third one

snuyanzin
snuyanzin reviewed Dec 18, 2025
View reviewed changes
pom.xml Outdated
Comment on lines 1806 to 1810
<trimStackTrace>false</trimStackTrace>
<environmentVariables>
<!-- Force docker-java to use API version 1.41 for compatibility with CI environment -->
<DOCKER_API_VERSION>1.41</DOCKER_API_VERSION>
</environmentVariables>
Copy link
Contributor

@snuyanzin snuyanzin Dec 18, 2025

Choose a reason for hiding this comment

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

no need for that probably if you bump to 2.0.3

@MartijnVisser
[FLINK-38809][Tests] Migrate flink-end-to-end-tests-common from JUnit…
3e22d08 
…4 to JUnit5

Testcontainers 2.0.2 removed JUnit4 support, requiring migration to JUnit5. Created local ExternalResource interface to be fully JUnit5-compatible with minimum code changes.

This migration allows the module to work with Testcontainers 2.0.2 while maintaining all existing test functionality.
@MartijnVisser
[FLINK-38809][Tests] Upgrade Testcontainers to 2.0.3
ff04356
@MartijnVisser MartijnVisser changed the title [FLINK-38809][Tests] Upgrade Testcontainers to 2.0.2 [FLINK-38809][Tests] Upgrade Testcontainers to 2.0.3 Dec 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@snuyanzin snuyanzin snuyanzin left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@MartijnVisser @flinkbot @gustavodemorais @snuyanzin