From 2e2fdedeba15507fd873b2e04d4649bcd2ec1389 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 10 Oct 2024 10:05:56 +0100 Subject: [PATCH] Enable temurin vs2022_redist devkit Signed-off-by: Andrew Leonard --- .../jobs/configurations/jdk11u_pipeline_config.groovy | 6 +++--- .../jobs/configurations/jdk17u_pipeline_config.groovy | 8 +++----- .../jobs/configurations/jdk21u_pipeline_config.groovy | 5 ++--- .../jobs/configurations/jdk23u_pipeline_config.groovy | 5 ++--- .../jobs/configurations/jdk24_pipeline_config.groovy | 5 ++--- .../jobs/configurations/jdk8u_pipeline_config.groovy | 4 ++-- 6 files changed, 14 insertions(+), 19 deletions(-) diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy index 4bf1d2cac..8e16dc941 100644 --- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy @@ -79,7 +79,7 @@ class Config11 { 'temurin' : '--disable-ccache' ], buildArgs : [ - 'temurin' : '--jvm-variant client,server --create-sbom' + 'temurin' : '--jvm-variant client,server --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ], test : 'default' ], @@ -92,7 +92,7 @@ class Config11 { 'temurin' : '--disable-ccache' ], buildArgs : [ - 'temurin' : '--jvm-variant client,server --create-sbom' + 'temurin' : '--jvm-variant client,server --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ], test : 'default' ], @@ -253,7 +253,7 @@ class Config11 { 'temurin' : '--disable-ccache' ], buildArgs : [ - 'temurin' : '--jvm-variant client,server --create-sbom --cross-compile' + 'temurin' : '--jvm-variant client,server --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ] ] ] diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy index 6c350c22d..3aa7991af 100644 --- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy @@ -70,9 +70,8 @@ class Config17 { arch : 'x64', additionalNodeLabels: 'win2022&&vs2019', test : 'default', - configureArgs : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22000.0/ucrt/DLLs/x64'", buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom' + 'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ] ], @@ -81,9 +80,8 @@ class Config17 { arch : 'x86-32', additionalNodeLabels: 'win2022&&vs2019', test : 'default', - configureArgs : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22000.0/ucrt/DLLs/x86'", buildArgs : [ - 'temurin' : '--jvm-variant client,server --create-jre-image --create-sbom' + 'temurin' : '--jvm-variant client,server --create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ] ], @@ -182,7 +180,7 @@ class Config17 { additionalNodeLabels: 'win2022&&vs2019', test : 'default', buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom --cross-compile' + 'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ] ] ] diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy index 2209d8ce6..b1b61c1e0 100644 --- a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy @@ -70,9 +70,8 @@ class Config21 { test: [ weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system'] ], - configureArgs : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22621.0/ucrt/DLLs/x64'", buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom' + 'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ] ], @@ -164,7 +163,7 @@ class Config21 { additionalNodeLabels: 'win2022&&vs2022', test : 'default', buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom --cross-compile' + 'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ] ] ] diff --git a/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy index d56a07076..decb963f3 100644 --- a/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy @@ -71,9 +71,8 @@ class Config23 { test: [ weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system'] ], - configureArgs : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22621.0/ucrt/DLLs/x64'", buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom' + 'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ] ], @@ -165,7 +164,7 @@ class Config23 { additionalNodeLabels: 'win2022&&vs2022', test : 'default', buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom --cross-compile' + 'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ] ] ] diff --git a/pipelines/jobs/configurations/jdk24_pipeline_config.groovy b/pipelines/jobs/configurations/jdk24_pipeline_config.groovy index 6968bdc4a..52b73d420 100644 --- a/pipelines/jobs/configurations/jdk24_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk24_pipeline_config.groovy @@ -71,9 +71,8 @@ class Config24 { test: [ weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system'] ], - configureArgs : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22621.0/ucrt/DLLs/x64'", buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom' + 'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ] ], @@ -165,7 +164,7 @@ class Config24 { additionalNodeLabels: 'win2022&&vs2022', test : 'default', buildArgs : [ - 'temurin' : '--create-jre-image --create-sbom --cross-compile' + 'temurin' : '--create-jre-image --create-sbom --cross-compile --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ] ] ] diff --git a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy index 8ecbe233b..00be49c5c 100644 --- a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy @@ -74,7 +74,7 @@ class Config8 { 'temurin' : '--disable-ccache' ], buildArgs : [ - 'temurin' : '--create-sbom' + 'temurin' : '--create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ] ], @@ -86,7 +86,7 @@ class Config8 { 'temurin' : '--disable-ccache' ], buildArgs : [ - temurin : '--jvm-variant client,server --create-sbom' + temurin : '--jvm-variant client,server --create-sbom --use-adoptium-devkit vs2022_redist_14.40.33807_10.0.26100.0' ], test : 'default' ],