This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new d47202c901 Azure-servicebus: fixed intermittent failures by switching
to another sql image
d47202c901 is described below
commit d47202c90126b2d9decc7ecd56d014463473e666
Author: Jiri Ondrusek <[email protected]>
AuthorDate: Wed Mar 12 10:31:07 2025 +0100
Azure-servicebus: fixed intermittent failures by switching to another sql
image
---
.../test/support/azure/AzureServiceBusTestResource.java | 17 ++++++++++-------
pom.xml | 1 -
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git
a/integration-tests-support/azure/src/main/java/org/apache/camel/quarkus/test/support/azure/AzureServiceBusTestResource.java
b/integration-tests-support/azure/src/main/java/org/apache/camel/quarkus/test/support/azure/AzureServiceBusTestResource.java
index 64317f6d7b..28eb3620c0 100644
---
a/integration-tests-support/azure/src/main/java/org/apache/camel/quarkus/test/support/azure/AzureServiceBusTestResource.java
+++
b/integration-tests-support/azure/src/main/java/org/apache/camel/quarkus/test/support/azure/AzureServiceBusTestResource.java
@@ -17,6 +17,7 @@
package org.apache.camel.quarkus.test.support.azure;
+import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -36,14 +37,14 @@ import org.testcontainers.utility.MountableFile;
public class AzureServiceBusTestResource implements
QuarkusTestResourceLifecycleManager {
private static final Logger LOGGER =
LoggerFactory.getLogger(AzureServiceBusTestResource.class);
- private static final String SQLEDGE_IMAGE =
ConfigProvider.getConfig().getValue("azure-sql-edge.container.image",
+ private static final String SQL_IMAGE =
ConfigProvider.getConfig().getValue("sql-server.container.image",
String.class);
private static final String EMULATOR_IMAGE =
ConfigProvider.getConfig().getValue("servicebus-emulator.container.image",
String.class);
private static final int SERVICEBUS_INNER_PORT = 5672;
private static final String MSSQL_PASSWORD = "12345678923456y!43";
- private GenericContainer<?> emulatorContainer, edgeContainer;
+ private GenericContainer<?> emulatorContainer, sqlContainer;
@Override
public Map<String, String> start() {
@@ -60,14 +61,16 @@ public class AzureServiceBusTestResource implements
QuarkusTestResourceLifecycle
try {
Network azureNetwork = Network.newNetwork();
- edgeContainer = new GenericContainer<>(SQLEDGE_IMAGE)
+ sqlContainer = new GenericContainer<>(SQL_IMAGE)
+
.withEnv(Collections.singletonMap("MSSQL_AGENT_ENABLED", "True"))
.withNetwork(azureNetwork)
.withLogConsumer(new Slf4jLogConsumer(LOGGER))
.withEnv("ACCEPT_EULA", "Y")
.withEnv("MSSQL_SA_PASSWORD", MSSQL_PASSWORD)
.withNetworkAliases("sql-edge")
- .waitingFor(Wait.forLogMessage(".*EdgeTelemetry
starting.*", 1));
- edgeContainer.start();
+ .waitingFor(
+ Wait.forLogMessage(".*xp_sqlagent_notify.*",
1));
+ sqlContainer.start();
emulatorContainer = new GenericContainer<>(EMULATOR_IMAGE)
.withNetwork(azureNetwork)
@@ -108,8 +111,8 @@ public class AzureServiceBusTestResource implements
QuarkusTestResourceLifecycle
if (emulatorContainer != null) {
emulatorContainer.stop();
}
- if (edgeContainer != null) {
- edgeContainer.stop();
+ if (sqlContainer != null) {
+ sqlContainer.stop();
}
} catch (Exception e) {
diff --git a/pom.xml b/pom.xml
index c5d0f6b546..9ea3c62b28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -223,7 +223,6 @@
<!-- Test container image properties -->
<activemq.container.image>mirror.gcr.io/rmohr/activemq:5.15.9-alpine</activemq.container.image>
<arangodb.container.image>mirror.gcr.io/arangodb:3.12.0</arangodb.container.image>
-
<azure-sql-edge.container.image>mcr.microsoft.com/azure-sql-edge:latest</azure-sql-edge.container.image>
<azurite.container.image>mcr.microsoft.com/azure-storage/azurite:3.33.0</azurite.container.image>
<calculator-ws.container.image>quay.io/l2x6/calculator-ws:1.2</calculator-ws.container.image>
<cassandra.container.image>mirror.gcr.io/cassandra:5.0.2</cassandra.container.image>
