Skip to content

Commit

Permalink
switch windows builds to use docker image from azurecr (#1170)
Browse files Browse the repository at this point in the history 
* switch windows builds to use docker image from azurecr

---------

Signed-off-by: Stewart X Addison <[email protected]>
  • Loading branch information
@sxa
sxa authored Dec 20, 2024
1 parent fd4b53c commit bbe5e72
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 16 deletions.
12 changes: 9 additions & 3 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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'
Expand Down Expand Up @@ -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',
Expand Down
12 changes: 9 additions & 3 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 : [
Expand All @@ -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 : [
Expand Down Expand Up @@ -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',
Expand Down
8 changes: 6 additions & 2 deletions pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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',
Expand Down
8 changes: 6 additions & 2 deletions pipelines/jobs/configurations/jdk23u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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',
Expand Down
8 changes: 6 additions & 2 deletions pipelines/jobs/configurations/jdk24_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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',
Expand Down
8 changes: 6 additions & 2 deletions pipelines/jobs/configurations/jdk25_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down Expand Up @@ -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',
Expand Down
8 changes: 6 additions & 2 deletions pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 : [
Expand All @@ -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'
Expand Down

0 comments on commit bbe5e72

Please sign in to comment.