From 8d50222633cc3c23a2dd2ee64e22afee1c1b6410 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 22 Dec 2023 17:47:02 +0000 Subject: [PATCH] Enable docker image for RISC-V on 21, 22, 23 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 --- pipelines/jobs/configurations/jdk21u_pipeline_config.groovy | 6 +++--- pipelines/jobs/configurations/jdk22_pipeline_config.groovy | 6 +++--- pipelines/jobs/configurations/jdk23_pipeline_config.groovy | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy index 3697aae8c..9948f8289 100644 --- 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-dtrace', buildArgs : [ diff --git a/pipelines/jobs/configurations/jdk22_pipeline_config.groovy b/pipelines/jobs/configurations/jdk22_pipeline_config.groovy index 84ccd5de2..4cb6af523 100644 --- 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-dtrace', buildArgs : [ diff --git a/pipelines/jobs/configurations/jdk23_pipeline_config.groovy b/pipelines/jobs/configurations/jdk23_pipeline_config.groovy index 545834019..da3ff6fa7 100644 --- 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-dtrace', buildArgs : [