From 1414761cb4509800026beae751ce8889483aa774 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Thu, 19 Dec 2024 16:41:23 +0000 Subject: [PATCH 1/2] switch windows builds to use docker image from azurecr Signed-off-by: Stewart X Addison --- .../configurations/jdk11u_pipeline_config.groovy | 12 +++++++++--- .../configurations/jdk17u_pipeline_config.groovy | 12 +++++++++--- .../configurations/jdk21u_pipeline_config.groovy | 8 ++++++-- .../configurations/jdk23u_pipeline_config.groovy | 8 ++++++-- .../jobs/configurations/jdk24_pipeline_config.groovy | 8 ++++++-- .../jobs/configurations/jdk25_pipeline_config.groovy | 8 ++++++-- .../jobs/configurations/jdk8u_pipeline_config.groovy | 8 ++++++-- 7 files changed, 48 insertions(+), 16 deletions(-) diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy index 0a3ab868e..0e61437ff 100644 --- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy @@ -70,7 +70,9 @@ class Config11 { x64Windows: [ os : 'windows', arch : 'x64', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: [ temurin: 'win2022&&vs2022', openj9: 'win2012&&vs2017', @@ -88,7 +90,9 @@ class Config11 { x32Windows: [ os : 'windows', arch : 'x86-32', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022&&vs2022', configureArgs : [ 'temurin' : '--disable-ccache' @@ -248,7 +252,9 @@ class Config11 { aarch64Windows: [ os : 'windows', arch : 'aarch64', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', 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 3cc96a97e..a3a6d3b57 100644 --- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy @@ -68,7 +68,9 @@ class Config17 { x64Windows: [ os : 'windows', arch : 'x64', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022&&vs2022', test : 'default', buildArgs : [ @@ -79,7 +81,9 @@ class Config17 { x32Windows: [ os : 'windows', arch : 'x86-32', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022&&vs2022', test : 'default', buildArgs : [ @@ -178,7 +182,9 @@ class Config17 { aarch64Windows: [ os : 'windows', arch : 'aarch64', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', 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 4c6c5b7a6..7ee60b4de 100644 --- a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy @@ -68,7 +68,9 @@ class Config21 { x64Windows: [ os : 'windows', arch : 'x64', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', 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'] @@ -164,7 +166,9 @@ class Config21 { aarch64Windows: [ os : 'windows', arch : 'aarch64', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', 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 c8a696c86..d996488b9 100644 --- a/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy @@ -69,7 +69,9 @@ class Config23 { x64Windows: [ os : 'windows', arch : 'x64', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', 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'] @@ -165,7 +167,9 @@ class Config23 { aarch64Windows: [ os : 'windows', arch : 'aarch64', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', 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 21af1a295..31a0a3632 100644 --- a/pipelines/jobs/configurations/jdk24_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk24_pipeline_config.groovy @@ -69,7 +69,9 @@ class Config24 { x64Windows: [ os : 'windows', arch : 'x64', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', 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'] @@ -165,7 +167,9 @@ class Config24 { aarch64Windows: [ os : 'windows', arch : 'aarch64', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', crossCompile : 'x64', additionalNodeLabels: 'win2022&&vs2022', test : 'default', diff --git a/pipelines/jobs/configurations/jdk25_pipeline_config.groovy b/pipelines/jobs/configurations/jdk25_pipeline_config.groovy index b29112660..784ce4dd1 100644 --- a/pipelines/jobs/configurations/jdk25_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk25_pipeline_config.groovy @@ -69,7 +69,9 @@ class Config25 { x64Windows: [ os : 'windows', arch : 'x64', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', 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'] @@ -165,7 +167,9 @@ class Config25 { aarch64Windows: [ os : 'windows', arch : 'aarch64', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', 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 2c30bec98..f2f8afb47 100644 --- a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy @@ -68,7 +68,9 @@ class Config8 { x64Windows : [ os : 'windows', arch : 'x64', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022&&vs2022', test : 'default', configureArgs : [ @@ -82,7 +84,9 @@ class Config8 { x32Windows : [ os : 'windows', arch : 'x86-32', - dockerImage : 'win2022_notrhel_image', + dockerImage : 'windows2022_build_iamge', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022', configureArgs : [ 'temurin' : '--disable-ccache' From 1719d797bb077138b1f548ac6e6501ae92a14dcc Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Thu, 19 Dec 2024 21:27:05 +0000 Subject: [PATCH 2/2] fix type in image name --- pipelines/jobs/configurations/jdk11u_pipeline_config.groovy | 6 +++--- pipelines/jobs/configurations/jdk17u_pipeline_config.groovy | 6 +++--- pipelines/jobs/configurations/jdk21u_pipeline_config.groovy | 4 ++-- pipelines/jobs/configurations/jdk23u_pipeline_config.groovy | 4 ++-- pipelines/jobs/configurations/jdk24_pipeline_config.groovy | 4 ++-- pipelines/jobs/configurations/jdk25_pipeline_config.groovy | 4 ++-- pipelines/jobs/configurations/jdk8u_pipeline_config.groovy | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy index 8d59aea5c..3a5365fb3 100644 --- a/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk11u_pipeline_config.groovy @@ -70,7 +70,7 @@ class Config11 { x64Windows: [ os : 'windows', arch : 'x64', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: [ @@ -90,7 +90,7 @@ class Config11 { x32Windows: [ os : 'windows', arch : 'x86-32', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022&&vs2022', @@ -252,7 +252,7 @@ class Config11 { aarch64Windows: [ os : 'windows', arch : 'aarch64', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', crossCompile : 'x64', diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy index ac926e106..03094fc76 100644 --- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy @@ -68,7 +68,7 @@ class Config17 { x64Windows: [ os : 'windows', arch : 'x64', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022&&vs2022', @@ -81,7 +81,7 @@ class Config17 { x32Windows: [ os : 'windows', arch : 'x86-32', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022&&vs2022', @@ -182,7 +182,7 @@ class Config17 { aarch64Windows: [ os : 'windows', arch : 'aarch64', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', crossCompile : 'x64', diff --git a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy index e18b2ea13..fd3539148 100644 --- a/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk21u_pipeline_config.groovy @@ -68,7 +68,7 @@ class Config21 { x64Windows: [ os : 'windows', arch : 'x64', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022&&vs2022', @@ -166,7 +166,7 @@ class Config21 { aarch64Windows: [ os : 'windows', arch : 'aarch64', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', crossCompile : 'x64', diff --git a/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy index 664d0fe06..1774f1786 100644 --- a/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk23u_pipeline_config.groovy @@ -69,7 +69,7 @@ class Config23 { x64Windows: [ os : 'windows', arch : 'x64', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022&&vs2022', @@ -167,7 +167,7 @@ class Config23 { aarch64Windows: [ os : 'windows', arch : 'aarch64', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', crossCompile : 'x64', diff --git a/pipelines/jobs/configurations/jdk24_pipeline_config.groovy b/pipelines/jobs/configurations/jdk24_pipeline_config.groovy index 792723769..c21a8760a 100644 --- a/pipelines/jobs/configurations/jdk24_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk24_pipeline_config.groovy @@ -69,7 +69,7 @@ class Config24 { x64Windows: [ os : 'windows', arch : 'x64', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022&&vs2022', @@ -167,7 +167,7 @@ class Config24 { aarch64Windows: [ os : 'windows', arch : 'aarch64', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', crossCompile : 'x64', diff --git a/pipelines/jobs/configurations/jdk25_pipeline_config.groovy b/pipelines/jobs/configurations/jdk25_pipeline_config.groovy index 3eed7e468..0331a09c1 100644 --- a/pipelines/jobs/configurations/jdk25_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk25_pipeline_config.groovy @@ -69,7 +69,7 @@ class Config25 { x64Windows: [ os : 'windows', arch : 'x64', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022&&vs2022', @@ -167,7 +167,7 @@ class Config25 { aarch64Windows: [ os : 'windows', arch : 'aarch64', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', crossCompile : 'x64', diff --git a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy index c38136f8a..e4a9368a7 100644 --- a/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk8u_pipeline_config.groovy @@ -68,7 +68,7 @@ class Config8 { x64Windows : [ os : 'windows', arch : 'x64', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022&&vs2022', @@ -84,7 +84,7 @@ class Config8 { x32Windows : [ os : 'windows', arch : 'x86-32', - dockerImage : 'windows2022_build_iamge', + dockerImage : 'windows2022_build_image', dockerRegistry : 'https://adoptium.azurecr.io', dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022',