Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions ansible/docker/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ pipeline {
}
stage('Ubuntu16.04 armv7l') {
agent {
label "docker&&linux&&armv7l"
label "dockerBuild&&linux&&aarch64"
}
steps {
dockerBuild('armv7l', 'ubuntu1604', 'Dockerfile.Ubuntu1604')
dockerBuildArm32('armv7l', 'ubuntu1604', 'Dockerfile.Ubuntu1604')
}
}
stage('Ubuntu20.04 riscv64') {
Expand Down Expand Up @@ -97,6 +97,22 @@ pipeline {
}
}

def dockerBuildArm32(architecture, distro, dockerfile) {
sh "rm -vf *.sha256"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to check for existence first?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-f should mean that's not required.

git poll: false, url: 'https://github.com/adoptium/infrastructure.git'
def git_sha = "${env.GIT_COMMIT.trim()}"
docker.withRegistry('https://ghcr.io', 'ghcr-adoptium') {
sh """
docker buildx build --platform linux/arm/v7 \
--build-arg git_sha=$git_sha --build-arg ansible_arch=$architecture \
-f ansible/docker/$dockerfile \
-t ghcr.io/adoptium/adoptium_build_image:${distro}_linux-$architecture --push .
docker inspect --format='{{index .RepoDigests 0}}' ghcr.io/adoptium/adoptium_build_image:${distro}_linux-${architecture} > ${distro}_linux-${architecture}.sha256
"""
archiveArtifacts artifacts: '*linux*.sha256', fingerprint: true
}
}

def dockerBuild(architecture, distro, dockerfile) {
sh "rm -vf *.sha256"
git poll: false, url: 'https://github.com/adoptium/infrastructure.git'
Expand Down
Loading