Skip to content

[Backport 3.x] Use Testcontainers for integration tests (#2033)#2054

Merged
reta merged 1 commit into
opensearch-project:3.xfrom
lsh1215:backport/2033-to-3.x
Jul 6, 2026
Merged

[Backport 3.x] Use Testcontainers for integration tests (#2033)#2054
reta merged 1 commit into
opensearch-project:3.xfrom
lsh1215:backport/2033-to-3.x

Conversation

@lsh1215

@lsh1215 lsh1215 commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Backport of #2033 to the 3.x branch. The automated backport failed to cherry-pick cleanly (https://github.com/opensearch-project/opensearch-java/actions/runs/28753546085), so this is the manual backport.

Conflicts resolved:

  • java-client/build.gradle.kts: kept the 3.x release version (opensearchVersion = "3.5.0") and moved the declaration above the integrationTest task so opensearchDockerVersion is defined before use.
  • CHANGELOG.md: kept only the Use Testcontainers for integration tests #2033 entry (dropped unrelated main-only entries that the squash diff pulled in).

Verified locally with ./gradlew :java-client:spotlessJavaCheck :java-client:compileJava21Java (BUILD SUCCESSFUL).

Backport of opensearch-project#2033 to the 3.x branch. Conflicts in build.gradle.kts (opensearchVersion location/value) and CHANGELOG.md were resolved to keep the 3.x release version and only the opensearch-project#2033 changelog entry.

Signed-off-by: sanghun <vitash1215@gmail.com>
@lsh1215

lsh1215 commented Jul 6, 2026

Copy link
Copy Markdown
Contributor Author

@reta this is the manual backport of #2033 to 3.x you asked for.

@reta reta added the v3.10.0 label Jul 6, 2026
@reta reta merged commit 54be089 into opensearch-project:3.x Jul 6, 2026
50 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants