Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ cosmos_org.apache.kafka:connect-api;3.6.0
cosmos_com.jayway.jsonpath:json-path;2.9.0
# Cosmos Kafka connector tests only
cosmos_org.apache.kafka:connect-runtime;3.6.0
cosmos_org.testcontainers:testcontainers;1.19.5
cosmos_org.testcontainers:kafka;1.19.5
cosmos_org.testcontainers:testcontainers;1.21.4
cosmos_org.testcontainers:kafka;1.21.4
cosmos_org.sourcelab:kafka-connect-client;4.0.4
cosmos_io.confluent:kafka-avro-serializer;7.6.0
cosmos_org.apache.avro:avro;1.11.4
Expand Down
4 changes: 2 additions & 2 deletions sdk/cosmos/azure-cosmos-kafka-connect/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,13 @@ Licensed under the MIT License.
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.19.5</version> <!-- {x-version-update;cosmos_org.testcontainers:testcontainers;external_dependency} -->
<version>1.21.4</version> <!-- {x-version-update;cosmos_org.testcontainers:testcontainers;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>kafka</artifactId>
<version>1.19.5</version> <!-- {x-version-update;cosmos_org.testcontainers:kafka;external_dependency} -->
<version>1.21.4</version> <!-- {x-version-update;cosmos_org.testcontainers:kafka;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.azure.cosmos.implementation.DocumentCollection;
import com.azure.cosmos.implementation.Strings;
import com.azure.cosmos.implementation.TestConfigurations;
import com.azure.cosmos.implementation.apachecommons.lang.tuple.Pair;
import com.azure.cosmos.implementation.caches.AsyncCache;
import com.azure.cosmos.kafka.connect.implementation.CosmosAadAuthConfig;
import com.azure.cosmos.kafka.connect.implementation.CosmosAuthType;
Expand All @@ -24,7 +25,6 @@
import org.apache.kafka.common.config.ConfigDef;
import org.apache.kafka.common.config.ConfigValue;
import org.apache.kafka.common.config.types.Password;
import org.testcontainers.shaded.org.apache.commons.lang3.tuple.Pair;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import reactor.core.publisher.Mono;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.azure.cosmos.implementation.Strings;
import com.azure.cosmos.implementation.Utils;
import com.azure.cosmos.implementation.apachecommons.lang.StringUtils;
import com.azure.cosmos.implementation.apachecommons.lang.tuple.Pair;
import com.azure.cosmos.implementation.caches.AsyncCache;
import com.azure.cosmos.implementation.changefeed.common.ChangeFeedMode;
import com.azure.cosmos.implementation.changefeed.common.ChangeFeedStartFromInternal;
Expand Down Expand Up @@ -53,7 +54,6 @@
import org.apache.kafka.common.config.types.Password;
import org.apache.kafka.connect.source.SourceConnectorContext;
import org.mockito.Mockito;
import org.testcontainers.shaded.org.apache.commons.lang3.tuple.Pair;
import org.testng.annotations.Test;
import reactor.core.publisher.Mono;

Expand Down
22 changes: 22 additions & 0 deletions sdk/cosmos/kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,25 @@ extends:
AdditionalVariables:
- name: AdditionalArgs
value: ''
PreTestRunSteps:
- script: |
if ! command -v docker &>/dev/null; then
echo "Docker not found; please install Docker or ensure it's available on the agent."
exit 1
fi

# wait for docker daemon to be ready
for i in {1..30}; do
if docker info >/dev/null 2>&1; then
echo "Docker is running"
break
fi
echo "Waiting for Docker to start... ($i/30)"
sleep 2
done

if ! docker info >/dev/null 2>&1; then
echo "Docker failed to start"
exit 1
fi
displayName: 'Ensure Docker is installed and running'
Loading