From 32b6a7a0a7013ec4943622c048f549e7ac28bb92 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Tue, 25 Nov 2025 13:03:24 +0000 Subject: [PATCH 1/2] add all hotspot variants so they are regenerated for trestle, remove third-party variants Signed-off-by: Stewart X Addison --- pipelines/jobs/configurations/jdk11u.groovy | 22 ++++++++-------- pipelines/jobs/configurations/jdk17u.groovy | 24 ++++++++++-------- pipelines/jobs/configurations/jdk21u.groovy | 28 +++++++++++++-------- pipelines/jobs/configurations/jdk25u.groovy | 24 ++++++++++++------ pipelines/jobs/configurations/jdk8u.groovy | 14 +++++------ 5 files changed, 65 insertions(+), 47 deletions(-) diff --git a/pipelines/jobs/configurations/jdk11u.groovy b/pipelines/jobs/configurations/jdk11u.groovy index 622afdf8d..e71402665 100644 --- a/pipelines/jobs/configurations/jdk11u.groovy +++ b/pipelines/jobs/configurations/jdk11u.groovy @@ -1,15 +1,15 @@ targetConfigurations = [ - 'x64Mac' : [ 'temurin', 'openj9' ], - 'x64Linux' : [ 'temurin', 'hotspot', 'dragonwell', 'corretto', 'bisheng', 'fast_startup'], - 'x64AlpineLinux': [ 'temurin' ], - 'x64Windows' : [ 'temurin', 'openj9', 'dragonwell' ], - 'x32Windows' : [ 'temurin' ], - 'ppc64Aix' : [ 'temurin', 'hotspot' ], - 'ppc64leLinux' : [ 'temurin', 'openj9' ], - 's390xLinux' : [ 'temurin', 'hotspot' ], - 'aarch64Linux' : [ 'temurin', 'openj9', 'dragonwell', 'bisheng' ], - 'aarch64Mac' : [ 'temurin', ], - 'arm32Linux' : [ 'temurin' ] + 'x64Mac' : [ 'temurin', 'hotspot' ], + 'x64Linux' : [ 'temurin', 'hotspot', 'dragonwell', 'corretto', 'bisheng', 'fast_startup'], + 'x64AlpineLinux': [ 'temurin', 'hotspot' ], + 'x64Windows' : [ 'temurin', 'hotspot' ], + 'x32Windows' : [ 'temurin', 'hotspot' ], + 'ppc64Aix' : [ 'temurin', 'hotspot' ], + 'ppc64leLinux' : [ 'temurin', 'hotspot' ], + 's390xLinux' : [ 'temurin', 'hotspot' ], + 'aarch64Linux' : [ 'temurin', 'hotspot' ], + 'aarch64Mac' : [ 'temurin', 'hotspot' ], + 'arm32Linux' : [ 'temurin', 'hotspot' ] ] // scmReferences to use for weekly release build diff --git a/pipelines/jobs/configurations/jdk17u.groovy b/pipelines/jobs/configurations/jdk17u.groovy index 06907b358..558f56972 100644 --- a/pipelines/jobs/configurations/jdk17u.groovy +++ b/pipelines/jobs/configurations/jdk17u.groovy @@ -1,21 +1,23 @@ targetConfigurations = [ 'x64Mac' : [ 'temurin', - 'openj9' + 'hotspot' ], 'x64Linux' : [ 'temurin', 'hotspot' ], 'x64AlpineLinux' : [ - 'temurin' + 'temurin', + 'hotspot' ], 'x64Windows' : [ 'temurin', - 'openj9' + 'hotspot' ], 'x32Windows' : [ - 'temurin' + 'temurin', + 'hotspot' ], 'ppc64Aix' : [ 'temurin', @@ -23,7 +25,7 @@ targetConfigurations = [ ], 'ppc64leLinux': [ 'temurin', - 'openj9' + 'hotspot' ], 's390xLinux' : [ 'temurin', @@ -31,17 +33,19 @@ targetConfigurations = [ ], 'aarch64Linux': [ 'temurin', - 'openj9', - 'bisheng' + 'hotspot' ], 'aarch64Mac': [ - 'temurin' + 'temurin', + 'hotspot' ], 'arm32Linux' : [ - 'temurin' + 'temurin', + 'hotspot' ], 'riscv64Linux': [ - 'temurin' + 'temurin', + 'hotspot' ] ] diff --git a/pipelines/jobs/configurations/jdk21u.groovy b/pipelines/jobs/configurations/jdk21u.groovy index 9b9343d88..e23288743 100644 --- a/pipelines/jobs/configurations/jdk21u.groovy +++ b/pipelines/jobs/configurations/jdk21u.groovy @@ -1,43 +1,51 @@ targetConfigurations = [ 'x64Mac' : [ - 'temurin' + 'temurin', + 'hotspot' ], 'x64Linux' : [ 'temurin', 'hotspot' ], 'x64AlpineLinux' : [ - 'temurin' + 'temurin', + 'hotspot' ], 'aarch64AlpineLinux' : [ - 'temurin' + 'temurin', + 'hotspot' ], 'x64Windows' : [ - 'temurin' + 'temurin', + 'hotspot' ], 'aarch64Windows' : [ - 'temurin' + 'temurin', + 'hotspot' ], 'ppc64Aix' : [ 'temurin', 'hotspot' ], 'ppc64leLinux': [ - 'temurin' + 'temurin', + 'hotspot' ], 's390xLinux' : [ 'temurin', 'hotspot' ], 'aarch64Linux': [ - 'hotspot', - 'temurin' + 'temurin', + 'hotspot' ], 'aarch64Mac': [ - 'temurin' + 'temurin', + 'hotspot' ], 'riscv64Linux': [ - 'temurin' + 'temurin', + 'hotspot' ] ] diff --git a/pipelines/jobs/configurations/jdk25u.groovy b/pipelines/jobs/configurations/jdk25u.groovy index 78b2b6d31..86f25a373 100644 --- a/pipelines/jobs/configurations/jdk25u.groovy +++ b/pipelines/jobs/configurations/jdk25u.groovy @@ -1,29 +1,35 @@ targetConfigurations = [ 'x64Mac' : [ - 'temurin' + 'temurin', + 'hotspot' ], 'x64Linux' : [ 'temurin', 'hotspot' ], 'x64AlpineLinux' : [ - 'temurin' + 'temurin', + 'hotspot' ], 'aarch64AlpineLinux' : [ - 'temurin' + 'temurin', + 'hotspot' ], 'x64Windows' : [ - 'temurin' + 'temurin', + 'hotspot' ], 'aarch64Windows' : [ - 'temurin' + 'temurin', + 'hotspot' ], 'ppc64Aix' : [ 'temurin', 'hotspot' ], 'ppc64leLinux': [ - 'temurin' + 'temurin', + 'hotspot' ], 's390xLinux' : [ 'temurin', @@ -34,10 +40,12 @@ targetConfigurations = [ 'temurin' ], 'aarch64Mac': [ - 'temurin' + 'temurin', + 'hotspot' ], 'riscv64Linux': [ - 'temurin' + 'temurin', + 'hotspot' ] ] diff --git a/pipelines/jobs/configurations/jdk8u.groovy b/pipelines/jobs/configurations/jdk8u.groovy index 473bf09d8..a8fa7be7a 100644 --- a/pipelines/jobs/configurations/jdk8u.groovy +++ b/pipelines/jobs/configurations/jdk8u.groovy @@ -15,12 +15,11 @@ targetConfigurations = [ ], 'x32Windows' : [ 'temurin', - 'openj9' + 'hotspot' ], 'x64Windows' : [ 'temurin', - 'openj9', - 'dragonwell' + 'hotspot' ], 'ppc64Aix' : [ 'temurin', @@ -28,19 +27,18 @@ targetConfigurations = [ ], 'ppc64leLinux' : [ 'temurin', - 'openj9' + 'hotspot' ], 's390xLinux' : [ 'openj9' ], 'aarch64Linux' : [ 'temurin', - 'openj9', - 'dragonwell', - 'bisheng' + 'hotspot' ], 'arm32Linux' : [ - 'temurin' + 'temurin', + 'hotspot' ] ] From b2ac4feb7d94ad6477073100223e2208b0845184 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Thu, 27 Nov 2025 18:10:19 +0000 Subject: [PATCH 2/2] Add hotspot regeneration for arm32 for jdk25/26 for trestle Signed-off-by: Stewart X Addison --- pipelines/jobs/configurations/jdk25u.groovy | 3 +++ pipelines/jobs/configurations/jdk26.groovy | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pipelines/jobs/configurations/jdk25u.groovy b/pipelines/jobs/configurations/jdk25u.groovy index 86f25a373..5bf361c3c 100644 --- a/pipelines/jobs/configurations/jdk25u.groovy +++ b/pipelines/jobs/configurations/jdk25u.groovy @@ -43,6 +43,9 @@ targetConfigurations = [ 'temurin', 'hotspot' ], + 'arm32Linux' : [ + 'hotspot' + ], 'riscv64Linux': [ 'temurin', 'hotspot' diff --git a/pipelines/jobs/configurations/jdk26.groovy b/pipelines/jobs/configurations/jdk26.groovy index 77256624b..d8d0707c6 100644 --- a/pipelines/jobs/configurations/jdk26.groovy +++ b/pipelines/jobs/configurations/jdk26.groovy @@ -33,6 +33,9 @@ targetConfigurations = [ 'aarch64Mac': [ 'temurin' ], + 'arm32Linux' : [ + 'hotspot' + ], 'riscv64Linux': [ 'temurin' ]