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

adoptium · Dec 20, 2023 · 1a7c54c · 1a7c54c
1 parent ac8e8a0
commit 1a7c54c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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           : [