Update linux-riscv64 jdk11u pipeline to temurin

The backport has been merged upstream with [1]. [1] openjdk/riscv-port-jdk11u@309291f
adoptium · Feb 29, 2024 · 42dc5de · 42dc5de
1 parent 9569169
commit 42dc5de
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy
@@ -254,6 +254,8 @@ class Build {
                     suffix = 'adoptium/aarch32-jdk8u'
                 } else if (buildConfig.TARGET_OS == 'alpine-linux' && buildConfig.JAVA_TO_BUILD == 'jdk8u') {
                     suffix = 'adoptium/alpine-jdk8u'
+                } else if (buildConfig.ARCHITECTURE == 'riscv64' && buildConfig.JAVA_TO_BUILD == 'jdk11u') {
+                    suffix = 'adoptium/riscv-jdk11u'
                 } else {
                     suffix = "adoptium/${buildConfig.JAVA_TO_BUILD}"
                 }

diff --git a/pipelines/jobs/configurations/jdk11u_evaluation.groovy b/pipelines/jobs/configurations/jdk11u_evaluation.groovy
@@ -4,7 +4,7 @@ targetConfigurations = [
                 'temurin'
         ],
         'riscv64Linux': [
-                'hotspot'
+                'temurin'
         ]
         // 'x64Mac'        : [
         //         'openj9'

diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
@@ -183,29 +183,35 @@ class Config11 {
                 arch                 : 'riscv64',
                 dockerImage          : [
                         'hotspot'    : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
+                        'temurin'    : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
                         'openj9'     : 'adoptopenjdk/centos6_build_image',
                         'bisheng'    : 'adoptopenjdk/centos6_build_image'
                 ],
                 dockerArgs           : [
                         'hotspot'    : '--platform linux/riscv64'
+                        'temurin'    : '--platform linux/riscv64'
                 ],
                 crossCompile         : [
                         'hotspot'    : 'dockerhost-rise-ubuntu2204-aarch64-1',
+                        'temurin'    : 'dockerhost-rise-ubuntu2204-aarch64-1',
                         'openj9'     : 'x64',
                         'bisheng'    : 'x64'
                 ],
                 buildArgs            : [
                         'hotspot'    : '--create-sbom',
+                        'temurin'    : '--create-sbom',
                         'openj9'     : '--cross-compile',
                         'bisheng'    : '--cross-compile --branch risc-v'
                 ],
                 configureArgs        : [
                         'hotspot'    : '--enable-headless-only=yes --enable-dtrace',
+                        'temurin'    : '--enable-headless-only=yes --enable-dtrace',
                         'openj9'     : '--disable-ddr --openjdk-target=riscv64-unknown-linux-gnu --with-sysroot=/opt/fedora28_riscv_root',
                         'bisheng'    : '--openjdk-target=riscv64-unknown-linux-gnu --with-sysroot=/opt/fedora28_riscv_root --with-jvm-features=shenandoahgc'
                 ],
                 test                : [
                         'hotspot'   : 'default',
+                        'temurin'   : 'default',
                         'openj9'    : [
                                 nightly: ['sanity.openjdk'],
                                 weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']