Enable docker image for RISC-V on 21, 22, 23 (#869)

We verified it works on jdk21u with https://ci.adoptium.net/job/build-scripts/job/jobs/job/evaluation/job/jobs/job/jdk21u/job/jdk21u-evaluation-linux-riscv64-temurin/92
adoptium · Dec 28, 2023 · 5901e15 · 5901e15
1 parent 5dd69da
commit 5901e15
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
@@ -166,9 +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',
+                crossCompile        : 'dockerhost-rise-ubuntu2204-aarch64-1',
+                dockerImage         : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
+                dockerArgs          : '--platform linux/riscv64',
                 test                : 'default',
                 configureArgs       : '--enable-headless-only=yes --enable-dtrace',
                 buildArgs           : [

diff --git a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy b/pipelines/jobs/configurations/jdk22_pipeline_config.groovy
@@ -145,9 +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',
+                crossCompile        : 'dockerhost-rise-ubuntu2204-aarch64-1',
+                dockerImage         : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
+                dockerArgs          : '--platform linux/riscv64',
                 test                : 'default',
                 configureArgs       : '--enable-headless-only=yes --enable-dtrace',
                 buildArgs           : [

diff --git a/pipelines/jobs/configurations/jdk23_pipeline_config.groovy b/pipelines/jobs/configurations/jdk23_pipeline_config.groovy
@@ -145,6 +145,9 @@ class Config23 {
         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-headless-only=yes --enable-dtrace',
                 buildArgs           : [