Add s390x architecture support for cp-base-java#1384
Open
Krish Vora (KrishVora01) wants to merge 18 commits into8.2.xfrom
Open
Add s390x architecture support for cp-base-java#1384Krish Vora (KrishVora01) wants to merge 18 commits into8.2.xfrom
Krish Vora (KrishVora01) wants to merge 18 commits into8.2.xfrom
Conversation
- service.yml: add s390x_docker_repos (cp-base-java) and s390x_maven_modules (base-java), increase execution_time_limit to 2h - Disable spotify dockerfile-maven-plugin in base, base-java, base-lite, jmxterm pom.xml files (fabric8 migration from PR #1357) - Fix golang image reference in base-lite/Dockerfile.ubi9 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The docker profile activates the Spotify dockerfile-maven-plugin, which is disabled in the child POMs. Switch to docker-fabric8 so the fabric8 docker-maven-plugin builds the images instead. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- Change maven profile from jenkins,docker to jenkins,docker-fabric8 - Guard PACKAGING_BUILD_ARGS -D flags to prevent fabric8 null build arg failures from empty values Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
OS_PACKAGES_URL is always derived from PACKAGES_URL via sed, so it will always be non-empty when PACKAGES_URL is set. No guard needed. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
When a guard condition is false, [[ -n "" ]] && ... returns exit code 1 which fails the CI step. Append || true to ensure the block always succeeds. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Was using ubi9-minimal.temurin-21-jdk.version (21.0.10.0.0.7-0) instead of ubi9-minimal.image.version (9.7-...), causing fabric8 to try pulling a non-existent ubi9-minimal image tag. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
s390x images are cross-built via docker buildx on amd64 CI machines, but the resulting containers can't run on amd64 for testing. Adding -Ddocker.skip-test=true to s390x maven commands to skip the tests. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The make-assembly-for-docker execution is disabled, so the package directory is never created. The inherited create-licenses-for-docker goal fails looking for that missing directory. Disable it too. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
… run Instead of disabling make-assembly-for-docker (which broke the inherited create-licenses-for-docker goal), just disable the Spotify plugin and let fabric8 handle the Docker build while assembly and license generation continue working as before. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
if statements always return 0 when the condition is false, avoiding the exit code pitfall that required || true as a workaround. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Register QEMU binfmt for s390x before the maven build so Docker can run s390x containers on amd64 CI machines for testing. Removes the -Ddocker.skip-test=true workaround. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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
1 participant
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.
Summary
cp-base-javaIS_S390Xconditional for multi-arch imagesci-tools ci-update-versionto use--direct-pom-editChanges
service.yml: Adds390x_docker_reposands390x_maven_modulesconfig.semaphore/semaphore.yml: Add s390x build block (PR builds).semaphore/cp_dockerfile_build.yml: Add s390x build, deploy, manifest blocks (task builds).semaphore/cp_dockerfile_promote.yml: Add s390x promote and manifest blocksbase/pom.xml,base-java/pom.xml,base-lite/pom.xml,jmxterm/pom.xml: Disable Spotify pluginbase-lite/Dockerfile.ubi9: Qualify golang FROM image🤖 Generated with Claude Code