Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use dockerhost-rise-ubuntu2204-aarch64-1 host to run in QEMU for riscv64 #864

Merged
merged 5 commits into from
Dec 21, 2023
Merged

Use dockerhost-rise-ubuntu2204-aarch64-1 host to run in QEMU for riscv64 #864

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d54010
Use cross-compilation with Docker for riscv64
luhenry Nov 5, 2023
5b3774f
Merge branch 'master' of github.com:adoptium/ci-jenkins-pipelines int…
luhenry Nov 9, 2023
ac8e8a0
Merge branch 'master' of github.com:adoptium/ci-jenkins-pipelines int…
luhenry Dec 15, 2023
1a7c54c
Use dockerhost-rise-ubuntu2204-aarch64-1 host to run in QEMU for riscv64
luhenry Dec 20, 2023
d6467d2
Fix missing comma
luhenry Dec 21, 2023
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
3 changes: 3 additions & 0 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ class Config17 {
riscv64Linux : [
os : 'linux',
arch : 'riscv64',
crossCompile : 'dockerhost-rise-ubuntu2204-aarch64-1'
dockerImage : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
dockerArgs : '--platform linux/riscv64',
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
Expand Down
3 changes: 3 additions & 0 deletions pipelines/jobs/configurations/jdk19u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,9 @@ class Config19 {
riscv64Linux : [
os : 'linux',
arch : 'riscv64',
crossCompile : 'dockerhost-rise-ubuntu2204-aarch64-1'
dockerImage : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
dockerArgs : '--platform linux/riscv64',
configureArgs : '--enable-dtrace',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
Expand Down
3 changes: 3 additions & 0 deletions pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ class Config20 {
riscv64Linux : [
os : 'linux',
arch : 'riscv64',
crossCompile : 'dockerhost-rise-ubuntu2204-aarch64-1'
dockerImage : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
dockerArgs : '--platform linux/riscv64',
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
Expand Down
3 changes: 3 additions & 0 deletions pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ class Config21 {
riscv64Linux : [
os : 'linux',
arch : 'riscv64',
// crossCompile : 'dockerhost-rise-ubuntu2204-aarch64-1',
Copy link
Contributor Author

@luhenry luhenry Dec 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

@sxa can we actually enable this one as well? (regarding the bootjdk issue)

Copy link
Member

Choose a reason for hiding this comment

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

Since we're using 21 to bootstrap 21 on RISC-V then yeah as soon as we've got a suitable boot JDK that can be used then we can enable this.
On my "static" containerized build environemnts on my machines I've manually installed the 21.0.1+12.1 JDK and symlinked to /usr/lib/jvm/jdk-21 - we should set up the playbooks to do that.

// dockerImage : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
// dockerArgs : '--platform linux/riscv64',
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
Expand Down
3 changes: 3 additions & 0 deletions pipelines/jobs/configurations/jdk22_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,9 @@ class Config22 {
riscv64Linux : [
os : 'linux',
arch : 'riscv64',
// crossCompile : 'dockerhost-rise-ubuntu2204-aarch64-1',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@sxa same as jdk21u

// dockerImage : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
// dockerArgs : '--platform linux/riscv64',
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
Expand Down
Loading