You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2026/07/07 14:59:30 UTC
(camel-quarkus) branch 3.33.x updated (c86112ccc2 -> 1ba63be88c)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch 3.33.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from c86112ccc2 Upgrade Camel to 4.18.3
new adb41606a8 Ensure correct branch is cloned for examples job in CI workflow
new 12e166edb7 Increase KafkaTest timeout
new dcb962a1b5 Increase timeout for QuartzClusteredTest
new 3167d6f1b7 Add possibility to skip CommandModeTest timing-sensitive test on slow machine
new 9933b87418 Possiblity to disable Jolokia multicast
new 1ba63be88c Check for local Docker socket or remote Docker via DOCKER_HOST
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/ci-build.yaml | 3 +++
.../quarkus/component/aws2/lambda/it/Aws2LambdaTest.java | 12 +++---------
.../quarkus/test/support/aws2/DockerSocketAvailable.java | 15 +++++++--------
.../camel/quarkus/component/jolokia/it/JolokiaTest.java | 10 +++++++++-
.../apache/camel/quarkus/kafka/oauth/it/KafkaTest.java | 2 +-
.../apache/camel/quarkus/main/cmd/it/CommandModeTest.java | 1 +
.../quarkus/component/quartz/it/QuartzClusteredTest.java | 2 +-
7 files changed, 25 insertions(+), 20 deletions(-)
copy extensions-support/httpclient5/runtime/src/main/java/org/apache/camel/quarkus/support/httpclient5/graal/BrotliAbsentBooleanSupplier.java => integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/DockerSocketAvailable.java (71%)
(camel-quarkus) 05/06: Possiblity to disable Jolokia multicast
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.33.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9933b87418f828b683ec757160b858ecd2a09046
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Mon Jul 6 11:01:42 2026 +0200
Possiblity to disable Jolokia multicast
---
.../apache/camel/quarkus/component/jolokia/it/JolokiaTest.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/integration-tests/jolokia/src/test/java/org/apache/camel/quarkus/component/jolokia/it/JolokiaTest.java b/integration-tests/jolokia/src/test/java/org/apache/camel/quarkus/component/jolokia/it/JolokiaTest.java
index 45a618e88b..430d05c22a 100644
--- a/integration-tests/jolokia/src/test/java/org/apache/camel/quarkus/component/jolokia/it/JolokiaTest.java
+++ b/integration-tests/jolokia/src/test/java/org/apache/camel/quarkus/component/jolokia/it/JolokiaTest.java
@@ -39,13 +39,21 @@ class JolokiaTest {
@Test
void defaultConfiguration() {
+ // Read the configured discovery mode to determine expected discoveryEnabled value
+ // Some machines don't support IPV4 multicast
+ String discoveryMode = ConfigProvider.getConfig()
+ .getOptionalValue("quarkus.camel.jolokia.server.discovery-enabled-mode", String.class)
+ .orElse("all");
+
+ boolean discoveryExpected = !"none".equals(discoveryMode);
+
RestAssured.given()
.get("/jolokia/")
.then()
.statusCode(200)
.body(
"status", equalTo(200),
- "value.config.discoveryEnabled", equalTo("true"),
+ "value.config.discoveryEnabled", equalTo(String.valueOf(discoveryExpected)),
"value.config.restrictorClass", equalTo(CamelJolokiaRestrictor.class.getName()),
"value.config.agentDescription", equalTo("camel-quarkus-integration-test-jolokia"),
"value.details.url", matchesPattern("http://.*:8778/jolokia"));
(camel-quarkus) 04/06: Add possibility to skip CommandModeTest timing-sensitive test on slow machine
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.33.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3167d6f1b71422223222a0ba984ed59c4cdfd3a0
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Mon Jul 6 10:47:14 2026 +0200
Add possibility to skip CommandModeTest timing-sensitive test on slow machine
---
.../test/java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/integration-tests/main-command-mode/src/test/java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java b/integration-tests/main-command-mode/src/test/java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java
index 4145cea897..988bbe7ba4 100644
--- a/integration-tests/main-command-mode/src/test/java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java
+++ b/integration-tests/main-command-mode/src/test/java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java
@@ -79,6 +79,7 @@ public class CommandModeTest {
}
@Test
+ @DisabledIfSystemProperty(named = "ci.slow.machine", matches = "true", disabledReason = "Test is timing-sensitive and may be unreliable on slow machines")
void testMainStopsAfterMaxSeconds() throws IOException, InterruptedException, ExecutionException {
final StartedProcess process = new QuarkusProcessExecutor("-Dgreeted.subject=Jade",
"-Dcamel.main.duration-max-seconds=3").start();
(camel-quarkus) 06/06: Check for local Docker socket or remote Docker via DOCKER_HOST
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.33.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 1ba63be88cb1a511cdbe6fa27d45f7d496676ef7
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Tue Jul 7 09:32:08 2026 +0200
Check for local Docker socket or remote Docker via DOCKER_HOST
---
.../component/aws2/lambda/it/Aws2LambdaTest.java | 12 +++------
.../test/support/aws2/DockerSocketAvailable.java | 30 ++++++++++++++++++++++
2 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java
index b6491c0c1f..e5819caf1b 100644
--- a/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java
+++ b/integration-test-groups/aws2/aws2-lambda/src/test/java/org/apache/camel/quarkus/component/aws2/lambda/it/Aws2LambdaTest.java
@@ -19,8 +19,6 @@ package org.apache.camel.quarkus.component.aws2.lambda.it;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.zip.ZipEntry;
@@ -31,11 +29,11 @@ import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import io.restassured.response.ExtractableResponse;
+import org.apache.camel.quarkus.test.EnabledIf;
import org.apache.camel.quarkus.test.support.aws2.Aws2TestResource;
import org.apache.camel.quarkus.test.support.aws2.BaseAWs2TestSupport;
+import org.apache.camel.quarkus.test.support.aws2.DockerSocketAvailable;
import org.jboss.logging.Logger;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
@@ -50,6 +48,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
@DisabledOnOs(value = OS.MAC, disabledReason = "Requires /var/run/docker.sock mount")
@QuarkusTest
@QuarkusTestResource(Aws2TestResource.class)
+@EnabledIf(DockerSocketAvailable.class)
class Aws2LambdaTest extends BaseAWs2TestSupport {
private static final Logger LOG = Logger.getLogger(Aws2LambdaTest.class);
@@ -57,11 +56,6 @@ class Aws2LambdaTest extends BaseAWs2TestSupport {
super("/aws2-lambda");
}
- @BeforeEach
- public void beforeEach() {
- Assumptions.assumeTrue(Files.exists(Paths.get("/var/run/docker.sock")));
- }
-
@Test
public void performingOperationsOnLambdaFunctionShouldSucceed() {
final String functionName = "cqFunction" + java.util.UUID.randomUUID().toString().replace("-", "");
diff --git a/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/DockerSocketAvailable.java b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/DockerSocketAvailable.java
new file mode 100644
index 0000000000..ee81c6ac89
--- /dev/null
+++ b/integration-tests-support/aws2/src/test/java/org/apache/camel/quarkus/test/support/aws2/DockerSocketAvailable.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.test.support.aws2;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.function.BooleanSupplier;
+
+public class DockerSocketAvailable implements BooleanSupplier {
+ @Override
+ public boolean getAsBoolean() {
+ // Check for local Docker socket or remote Docker via DOCKER_HOST
+ return Files.exists(Path.of("/var/run/docker.sock"))
+ || System.getenv("DOCKER_HOST") != null;
+ }
+}
(camel-quarkus) 03/06: Increase timeout for QuartzClusteredTest
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.33.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit dcb962a1b5a36fe2f6129805e2b86a88c3669e5a
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Mon Jul 6 10:37:57 2026 +0200
Increase timeout for QuartzClusteredTest
---
.../apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java
index 5deb29eee8..edb7314eb4 100644
--- a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java
+++ b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredTest.java
@@ -101,7 +101,7 @@ class QuartzClusteredTest {
}
private void awaitStartup(QuarkusProcessExecutor quarkusProcessExecutor) {
- Awaitility.await().atMost(30, TimeUnit.SECONDS).pollDelay(1, TimeUnit.SECONDS).until(() -> {
+ Awaitility.await().atMost(1, TimeUnit.MINUTES).pollDelay(1, TimeUnit.SECONDS).until(() -> {
return isApplicationHealthy(quarkusProcessExecutor.getHttpPort());
});
}
(camel-quarkus) 02/06: Increase KafkaTest timeout
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.33.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 12e166edb704cb5d385e24b6ed3a632cb186b7f4
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Mon Jul 6 10:36:17 2026 +0200
Increase KafkaTest timeout
---
.../test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaTest.java b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaTest.java
index a858d76b8a..914cb3c510 100644
--- a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaTest.java
+++ b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaTest.java
@@ -31,7 +31,7 @@ public class KafkaTest {
@Test
public void testKafka() {
- await().atMost(10, TimeUnit.SECONDS).until(() -> {
+ await().atMost(45, TimeUnit.SECONDS).until(() -> {
String message = RestAssured.get("/kafka-oauth").asString();
return message != null && message.contains("Message #");
});
(camel-quarkus) 01/06: Ensure correct branch is cloned for examples job in CI workflow
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.33.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit adb41606a8999e51f3ee3c71bcb7ca928c97f63d
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Jul 7 13:03:39 2026 +0100
Ensure correct branch is cloned for examples job in CI workflow
---
.github/workflows/ci-build.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 209df8620a..dd6a8ccbfa 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -494,6 +494,9 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+ with:
+ ref: ${{ env.CHECKOUT_REF }}
+ fetch-depth: 0
- name: Set up JDK 17
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
with: