From 98bc9ebf57133f38124b88c712748363df44b289 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 31 Aug 2026 06:35:01 +0000 Subject: [PATCH 1/2] chore(camel-test-infra-ibmmq): upgrade ibm.mq.container to 10.0.0.0-r4 Update ibm.mq.container from 10.0.0.0-r3 to 10.0.0.0-r4 --- .../resources/org/apache/camel/catalog/test-infra/metadata.json | 2 +- .../src/generated/resources/META-INF/metadata.json | 2 +- .../apache/camel/test/infra/ibmmq/services/container.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json index 36ead6666259e..552c77ca00686 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/test-infra/metadata.json @@ -293,7 +293,7 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-ibmmq", "version" : "4.23.0-SNAPSHOT", - "serviceVersion" : "10.0.0.0-r3", + "serviceVersion" : "10.0.0.0-r4", "uiSupported" : true }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", diff --git a/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json b/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json index 36ead6666259e..552c77ca00686 100644 --- a/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json +++ b/test-infra/camel-test-infra-all/src/generated/resources/META-INF/metadata.json @@ -293,7 +293,7 @@ "groupId" : "org.apache.camel", "artifactId" : "camel-test-infra-ibmmq", "version" : "4.23.0-SNAPSHOT", - "serviceVersion" : "10.0.0.0-r3", + "serviceVersion" : "10.0.0.0-r4", "uiSupported" : true }, { "service" : "org.apache.camel.test.infra.aws.common.services.AWSInfraService", diff --git a/test-infra/camel-test-infra-ibmmq/src/main/resources/org/apache/camel/test/infra/ibmmq/services/container.properties b/test-infra/camel-test-infra-ibmmq/src/main/resources/org/apache/camel/test/infra/ibmmq/services/container.properties index 15667a68ab857..448808f106bd9 100644 --- a/test-infra/camel-test-infra-ibmmq/src/main/resources/org/apache/camel/test/infra/ibmmq/services/container.properties +++ b/test-infra/camel-test-infra-ibmmq/src/main/resources/org/apache/camel/test/infra/ibmmq/services/container.properties @@ -14,5 +14,5 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --------------------------------------------------------------------------- -ibm.mq.container=icr.io/ibm-messaging/mq:10.0.0.0-r3 +ibm.mq.container=icr.io/ibm-messaging/mq:10.0.0.0-r4 ibm.mq.container.version.exclude=amd64,arm64,ppc64le,s390x,x86_64 From 8e5581815ce440f591fc4c8485c456ae07d3fc8c Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 3 Sep 2026 23:18:55 +0200 Subject: [PATCH 2/2] chore(camel-test-infra-ibmmq): increase JMS connection wait timeout to 60s The 30s Awaitility timeout in waitForJmsConnection() is too tight for resource-constrained environments. Since Awaitility exits as soon as the connection succeeds, a higher cap does not slow down passing tests. --- .../infra/ibmmq/services/IbmMQLocalContainerInfraService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-ibmmq/src/main/java/org/apache/camel/test/infra/ibmmq/services/IbmMQLocalContainerInfraService.java b/test-infra/camel-test-infra-ibmmq/src/main/java/org/apache/camel/test/infra/ibmmq/services/IbmMQLocalContainerInfraService.java index 41b577c539a1c..25eb678e9ed5a 100644 --- a/test-infra/camel-test-infra-ibmmq/src/main/java/org/apache/camel/test/infra/ibmmq/services/IbmMQLocalContainerInfraService.java +++ b/test-infra/camel-test-infra-ibmmq/src/main/java/org/apache/camel/test/infra/ibmmq/services/IbmMQLocalContainerInfraService.java @@ -108,7 +108,7 @@ public void initialize() { private void waitForJmsConnection() { Awaitility.await("IBM MQ accepting JMS connections") - .atMost(30, TimeUnit.SECONDS) + .atMost(60, TimeUnit.SECONDS) .pollInterval(1, TimeUnit.SECONDS) .ignoreExceptionsInstanceOf(JMSException.class) .until(() -> {