CAMEL-21577: Fix test-infra modules not using container.properties for Dockerfile base images - #25405
Open
tmielke wants to merge 3 commits into
Open
Conversation
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…t-infra-hivemq The Sparkplug TCK Dockerfile hardcoded its base image via ARG HIVEMQ_VERSION=2024.6, ignoring container.properties entirely. Externalize it using the same pattern as camel-test-infra-smb and camel-test-infra-cli: resolve the full image reference from container.properties via LocalPropertyResolver, wrap it with TestUtils.prependHubImageNamePrefixIfNeeded(), and pass it to the Dockerfile as a FROMIMAGE build arg. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
oscerd
approved these changes
Aug 7, 2026
davsclaus
approved these changes
Aug 7, 2026
Croway
approved these changes
Aug 7, 2026
Contributor
|
🌟 Thank you for your contribution to the Apache Camel project! 🌟 🐫 Apache Camel Committers, please review the following items:
|
Contributor
|
🧪 CI tested the following changed modules:
🔬 Scalpel shadow comparison — Scalpel: 14 tested, 29 compile-only — current: 14 all testedMaveniverse Scalpel detected 43 affected modules (current approach: 14).
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Summary
Three test-infra modules that build containers from Dockerfiles (
camel-test-infra-smb,camel-test-infra-cli,camel-test-infra-hivemq) had their base images hardcoded in Java constants or DockerfileARGdefaults, bypassingcontainer.properties.This meant the images could not be overridden via system properties or platform-specific keys, and environments using a private registry proxy (
hub.image.name.prefix) could not redirect the pulls.This PR externalizes the base image references into
container.propertiesusing a consistent pattern across all three modules:smb.service.from.image=mirror.gcr.io/fedora:43)ARG FROMIMAGE=<default>/FROM $FROMIMAGE(default preserved for standalonedocker build)LocalPropertyResolver, wraps withTestUtils.prependHubImageNamePrefixIfNeeded(), and passes it via.withBuildArg("FROMIMAGE", ...)Per-module details
camel-test-infra-smb — New
container.propertiesandSmbProperties.SMB_FROM_IMAGEconstant.SmbContainernow resolves the base image from properties instead of hardcoding it.camel-test-infra-cli — New
container.properties(includes the existing "run integration tests locally" warning).CliBuiltContainernow usesLocalPropertyResolverinstead ofSystem.getPropertywith a hardcoded fallback constant.camel-test-infra-hivemq — The Sparkplug TCK Dockerfile hardcoded
ARG HIVEMQ_VERSION=2024.6and the Java code never passed a build arg. Addedhivemq.sparkplug.from.imageto the existingcontainer.propertiesand wiredwithBuildArginLocalHiveMQSparkplugTCKInfraService. The standard HiveMQ service (LocalHiveMQInfraService) already usedcontainer.propertiescorrectly and was not changed.Test plan
mvn -DskipTests installin each module directory-Dsmb.service.from.image=...)Co-Authored-By: Claude Opus 4.6 noreply@anthropic.com
Target
mainbranch)Apache Camel coding standards and style
I checked that each commit in the pull request has a meaningful subject line and body.
I have run
mvn clean install -DskipTestslocally from root folder and I have committed all auto-generated changes.AI-assisted contributions
Co-authored-bytrailers) and the PR description identifies the AI tool used.