This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 7eb9d72b99d4 fix(test-infra): update to jdk21 for fedora:43
7eb9d72b99d4 is described below
commit 7eb9d72b99d4a08374e3f42ac573cfeb92f08073
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Fri Jan 30 10:36:20 2026 +0100
fix(test-infra): update to jdk21 for fedora:43
JDK17 is missing in the newer container image. For the sake of test it is
fine to upgrade to any newer JDK version.
Added a note to remind to run integration tests locally when changing the
container images versions.
Closes CAMEL-22933
---
.../org/apache/camel/test/infra/cli/services/CliBuiltContainer.java | 2 ++
.../camel/test/infra/cli/services/CliLocalContainerService.java | 4 ++--
.../resources/org/apache/camel/test/infra/cli/services/Dockerfile | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliBuiltContainer.java
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliBuiltContainer.java
index 5cce00c3b906..9d359629d537 100644
---
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliBuiltContainer.java
+++
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliBuiltContainer.java
@@ -46,6 +46,8 @@ public class CliBuiltContainer extends
GenericContainer<CliBuiltContainer> {
private static final String KEEP_RUNNING_ARG = "KEEP_RUNNING";
private static final String MOUNT_POINT = "/deployments/data";
private static final String SSH_PASSWORD_ARG = "SSH_PASSWORD_ARG";
+ // NOTE: make sure to run integration tests locally when changing in order
to
+ // validate potential breaking changes compatibility when building the
container
private static final String FROM_IMAGE_NAME = "mirror.gcr.io/fedora:43";
private static final String FROM_IMAGE_ARG = "FROMIMAGE";
protected static final int DEV_CONSOLE_PORT = 8080;
diff --git
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
index 265a27c6e614..03ffac8c21d0 100644
---
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
+++
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
@@ -170,7 +170,7 @@ public class CliLocalContainerService implements
CliService, ContainerService<Cl
@Override
public int getDevConsolePort() {
- return container.getMappedPort(container.DEV_CONSOLE_PORT);
+ return container.getMappedPort(CliBuiltContainer.DEV_CONSOLE_PORT);
}
@Override
@@ -207,7 +207,7 @@ public class CliLocalContainerService implements
CliService, ContainerService<Cl
@Override
public int getSshPort() {
- return container.getMappedPort(container.SSH_PORT);
+ return container.getMappedPort(CliBuiltContainer.SSH_PORT);
}
@Override
diff --git
a/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile
b/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile
index fc4719bb20a1..39d22a292826 100644
---
a/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile
+++
b/test-infra/camel-test-infra-cli/src/test/resources/org/apache/camel/test/infra/cli/services/Dockerfile
@@ -29,7 +29,7 @@ ARG SSH_PASSWORD=jbang
#update os and install tools
RUN dnf update -y \
- && dnf install java-17-openjdk-devel openssh-server xauth -y
+ && dnf install java-21-openjdk-devel openssh-server xauth -y
RUN ssh-keygen -A
