diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6667bfea4..59cae2d44 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -190,6 +190,7 @@ jobs: name: unit-test-results-java-${{ matrix.java }} path: | **/build/test-results/test/** + **/build/test-results/containerTest/** **/build/reports/tests/ retention-days: 30 diff --git a/CHANGES.txt b/CHANGES.txt index de8b008a1..2f1bd14b0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,6 @@ 0.3.0 ----- + * Fix StorageClientTest Docker API compatibility and improve CI test reporting (CASSSIDECAR-410) * Incorrect SSL Configuration Keys in CdcPublisher.secretsProvider() (CASSSIDECAR-401) * Fix ClusterTopologyMonitor delay parsing error due to missing time unit suffix (CASSSIDECAR-406) * Adding storage_port to instance configuration and metadata (CASSSIDECAR-399) diff --git a/server/build.gradle b/server/build.gradle index f0a5edc61..9cf929a26 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -202,7 +202,15 @@ dependencies { // Needed for snapshot manifest validation integrationTestImplementation(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: "${project.jacksonVersion}") - containerTestImplementation('com.adobe.testing:s3mock-testcontainers:2.17.0') // 3.x version do not support java 11 + + // GitHub-hosted runners require Docker API 1.44+ after Docker Engine 29.x upgrade (Feb 2026). + // s3mock-testcontainers 2.17.0 is needed for JDK 11 compatibility (3.x requires Java 17+), but it + // bundles an old testcontainers version. Excluding it and explicitly adding 1.21.4 for Docker API 1.44+ support. + containerTestImplementation('com.adobe.testing:s3mock-testcontainers:2.17.0') { + exclude group: 'org.testcontainers' + } + containerTestImplementation 'org.testcontainers:testcontainers:1.21.4' + containerTestImplementation 'org.testcontainers:junit-jupiter:1.21.4' } test {