Use dockerhost-rise-ubuntu2204-aarch64-1 host to run in QEMU for risc…

…v64 (#864) * Use cross-compilation with Docker for riscv64 The boards are just too limited at the moment. It only targets jdk17u, jdk19u, and jdk20u for now for lack of Ubuntu 20.04 compatible builds of jdk20u (for jdk21u) and jdk21u (for jdk22). Once we've some builds of jdk20u on Ubuntu 20.04, we can enable jdk21u. Next we can do jdk21u for jdk22. * Use dockerhost-rise-ubuntu2204-aarch64-1 host to run in QEMU for riscv64 * Fix missing comma
adoptium · Dec 21, 2023 · bb28b46 · bb28b46
1 parent cb03076
commit bb28b46
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 0 deletions.
diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
@@ -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           : [

diff --git a/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy
@@ -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'

diff --git a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
@@ -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           : [

diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
@@ -166,6 +166,9 @@ class Config21 {
         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           : [

diff --git a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy b/pipelines/jobs/configurations/jdk22_pipeline_config.groovy
@@ -145,6 +145,9 @@ class Config22 {
         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           : [