From 97c1a08a6b5bb48856a316e8a137a7948467aaf5 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Tue, 3 Dec 2024 14:54:39 +0000 Subject: [PATCH] windows: switch to running builds in docker containers Signed-off-by: Stewart X Addison --- pipelines/jobs/configurations/jdk11u_pipeline_config.groovy | 3 +++ pipelines/jobs/configurations/jdk17u_pipeline_config.groovy | 3 +++ pipelines/jobs/configurations/jdk21u_pipeline_config.groovy | 2 ++ pipelines/jobs/configurations/jdk23u_pipeline_config.groovy | 2 ++ pipelines/jobs/configurations/jdk24_pipeline_config.groovy | 2 ++ pipelines/jobs/configurations/jdk8u_pipeline_config.groovy | 2 ++ 6 files changed, 14 insertions(+) diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy index 697860168..0a3ab868e 100644 --- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy @@ -70,6 +70,7 @@ class Config11 { x64Windows: [ os : 'windows', arch : 'x64', + dockerImage : 'win2022_notrhel_image', additionalNodeLabels: [ temurin: 'win2022&&vs2022', openj9: 'win2012&&vs2017', @@ -87,6 +88,7 @@ class Config11 { x32Windows: [ os : 'windows', arch : 'x86-32', + dockerImage : 'win2022_notrhel_image', additionalNodeLabels: 'win2022&&vs2022', configureArgs : [ 'temurin' : '--disable-ccache' @@ -246,6 +248,7 @@ class Config11 { aarch64Windows: [ os : 'windows', arch : 'aarch64', + dockerImage : 'win2022_notrhel_image', crossCompile : 'x64', additionalNodeLabels: 'win2022&&vs2022', test : 'default', diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy index 28a2d6ed1..3cc96a97e 100644 --- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy @@ -68,6 +68,7 @@ class Config17 { x64Windows: [ os : 'windows', arch : 'x64', + dockerImage : 'win2022_notrhel_image', additionalNodeLabels: 'win2022&&vs2022', test : 'default', buildArgs : [ @@ -78,6 +79,7 @@ class Config17 { x32Windows: [ os : 'windows', arch : 'x86-32', + dockerImage : 'win2022_notrhel_image', additionalNodeLabels: 'win2022&&vs2022', test : 'default', buildArgs : [ @@ -176,6 +178,7 @@ class Config17 { aarch64Windows: [ os : 'windows', arch : 'aarch64', + dockerImage : 'win2022_notrhel_image', crossCompile : 'x64', additionalNodeLabels: 'win2022&&vs2022', test : 'default', diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy index e7208adbd..827222203 100644 --- a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy @@ -66,6 +66,7 @@ class Config21 { x64Windows: [ os : 'windows', arch : 'x64', + dockerImage : 'win2022_notrhel_image', additionalNodeLabels: 'win2022&&vs2022', 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', 'special.system'] @@ -161,6 +162,7 @@ class Config21 { aarch64Windows: [ os : 'windows', arch : 'aarch64', + dockerImage : 'win2022_notrhel_image', crossCompile : 'x64', additionalNodeLabels: 'win2022&&vs2022', test : 'default', diff --git a/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy index 527995b43..04f845a49 100644 --- a/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy @@ -67,6 +67,7 @@ class Config23 { x64Windows: [ os : 'windows', arch : 'x64', + dockerImage : 'win2022_notrhel_image', additionalNodeLabels: 'win2022&&vs2022', 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', 'special.system'] @@ -162,6 +163,7 @@ class Config23 { aarch64Windows: [ os : 'windows', arch : 'aarch64', + dockerImage : 'win2022_notrhel_image', crossCompile : 'x64', additionalNodeLabels: 'win2022&&vs2022', test : 'default', diff --git a/pipelines/jobs/configurations/jdk24_pipeline_config.groovy b/pipelines/jobs/configurations/jdk24_pipeline_config.groovy index ebca0f466..60e0d80d7 100644 --- a/pipelines/jobs/configurations/jdk24_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk24_pipeline_config.groovy @@ -67,6 +67,7 @@ class Config24 { x64Windows: [ os : 'windows', arch : 'x64', + dockerImage : 'win2022_notrhel_image', additionalNodeLabels: 'win2022&&vs2022', 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', 'special.system'] @@ -162,6 +163,7 @@ class Config24 { aarch64Windows: [ os : 'windows', arch : 'aarch64', + dockerImage : 'win2022_notrhel_image', crossCompile : 'x64', additionalNodeLabels: 'win2022&&vs2022', test : 'default', diff --git a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy index 9879a1aca..2c30bec98 100644 --- a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy @@ -68,6 +68,7 @@ class Config8 { x64Windows : [ os : 'windows', arch : 'x64', + dockerImage : 'win2022_notrhel_image', additionalNodeLabels: 'win2022&&vs2022', test : 'default', configureArgs : [ @@ -81,6 +82,7 @@ class Config8 { x32Windows : [ os : 'windows', arch : 'x86-32', + dockerImage : 'win2022_notrhel_image', additionalNodeLabels: 'win2022', configureArgs : [ 'temurin' : '--disable-ccache'