From 1a7c54ca60d0030bf34fd0e227e3a68bae708a07 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 20 Dec 2023 11:04:58 +0000 Subject: [PATCH] Use dockerhost-rise-ubuntu2204-aarch64-1 host to run in QEMU for riscv64 --- pipelines/jobs/configurations/jdk17u_pipeline_config.groovy | 2 +- pipelines/jobs/configurations/jdk19u_pipeline_config.groovy | 2 +- pipelines/jobs/configurations/jdk20u_pipeline_config.groovy | 2 +- pipelines/jobs/configurations/jdk21u_pipeline_config.groovy | 3 +++ pipelines/jobs/configurations/jdk22_pipeline_config.groovy | 3 +++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy index b12442064..ddc8d469f 100644 --- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy @@ -175,7 +175,7 @@ class Config17 { riscv64Linux : [ os : 'linux', arch : 'riscv64', - crossCompile : 'x64', + crossCompile : 'dockerhost-rise-ubuntu2204-aarch64-1' dockerImage : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64', dockerArgs : '--platform linux/riscv64', test : 'default', diff --git a/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy index edbbdb710..c9aa1255f 100644 --- a/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk19u_pipeline_config.groovy @@ -157,7 +157,7 @@ class Config19 { riscv64Linux : [ os : 'linux', arch : 'riscv64', - crossCompile : 'x64', + crossCompile : 'dockerhost-rise-ubuntu2204-aarch64-1' dockerImage : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64', dockerArgs : '--platform linux/riscv64', configureArgs : '--enable-dtrace', diff --git a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy index 804762f2f..9e45232ad 100644 --- a/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk20u_pipeline_config.groovy @@ -146,7 +146,7 @@ class Config20 { riscv64Linux : [ os : 'linux', arch : 'riscv64', - crossCompile : 'x64', + crossCompile : 'dockerhost-rise-ubuntu2204-aarch64-1' dockerImage : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64', dockerArgs : '--platform linux/riscv64', test : 'default', diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy index 811598d5c..3697aae8c 100644 --- 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 index 3f16d6fab..84ccd5de2 100644 --- 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 : [