From bbe5e72c72f2183d93aab264f46a7daba47464c2 Mon Sep 17 00:00:00 2001 From: Stewart X Addison <6487691+sxa@users.noreply.github.com> Date: Fri, 20 Dec 2024 10:16:58 +0000 Subject: [PATCH] switch windows builds to use docker image from azurecr (#1170) * 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 8b6a87901..3a5365fb3 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_image', + 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_image', + 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_image', + 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 7f038e1a1..03094fc76 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_image', + 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_image', + 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_image', + 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 f3bf6106e..fd3539148 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_image', + 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_image', + 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 6bf49d8a7..1774f1786 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_image', + 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_image', + 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 b6ef730ee..c21a8760a 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_image', + 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_image', + 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 e7d3abe81..0331a09c1 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_image', + 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_image', + 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 ffec27a0a..e4a9368a7 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_image', + 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_image', + dockerRegistry : 'https://adoptium.azurecr.io', + dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac', additionalNodeLabels: 'win2022', configureArgs : [ 'temurin' : '--disable-ccache'