Skip to content

Commit bbe5e72

Browse files
sxasxa
authored
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 <[email protected]>
1 parent fd4b53c commit bbe5e72

File tree

7 files changed

+48
-16
lines changed

7 files changed

+48
-16
lines changed

‎pipelines/jobs/configurations/jdk11u_pipeline_config.groovy‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ class Config11 {
7070
x64Windows: [
7171
os : 'windows',
7272
arch : 'x64',
73-
dockerImage : 'win2022_notrhel_image',
73+
dockerImage : 'windows2022_build_image',
74+
dockerRegistry : 'https://adoptium.azurecr.io',
75+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
7476
additionalNodeLabels: [
7577
temurin: 'win2022&&vs2022',
7678
openj9: 'win2012&&vs2017',
@@ -88,7 +90,9 @@ class Config11 {
8890
x32Windows: [
8991
os : 'windows',
9092
arch : 'x86-32',
91-
dockerImage : 'win2022_notrhel_image',
93+
dockerImage : 'windows2022_build_image',
94+
dockerRegistry : 'https://adoptium.azurecr.io',
95+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
9296
additionalNodeLabels: 'win2022&&vs2022',
9397
configureArgs : [
9498
'temurin' : '--disable-ccache'
@@ -248,7 +252,9 @@ class Config11 {
248252
aarch64Windows: [
249253
os : 'windows',
250254
arch : 'aarch64',
251-
dockerImage : 'win2022_notrhel_image',
255+
dockerImage : 'windows2022_build_image',
256+
dockerRegistry : 'https://adoptium.azurecr.io',
257+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
252258
crossCompile : 'x64',
253259
additionalNodeLabels: 'win2022&&vs2022',
254260
test : 'default',

‎pipelines/jobs/configurations/jdk17u_pipeline_config.groovy‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ class Config17 {
6868
x64Windows: [
6969
os : 'windows',
7070
arch : 'x64',
71-
dockerImage : 'win2022_notrhel_image',
71+
dockerImage : 'windows2022_build_image',
72+
dockerRegistry : 'https://adoptium.azurecr.io',
73+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
7274
additionalNodeLabels: 'win2022&&vs2022',
7375
test : 'default',
7476
buildArgs : [
@@ -79,7 +81,9 @@ class Config17 {
7981
x32Windows: [
8082
os : 'windows',
8183
arch : 'x86-32',
82-
dockerImage : 'win2022_notrhel_image',
84+
dockerImage : 'windows2022_build_image',
85+
dockerRegistry : 'https://adoptium.azurecr.io',
86+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
8387
additionalNodeLabels: 'win2022&&vs2022',
8488
test : 'default',
8589
buildArgs : [
@@ -178,7 +182,9 @@ class Config17 {
178182
aarch64Windows: [
179183
os : 'windows',
180184
arch : 'aarch64',
181-
dockerImage : 'win2022_notrhel_image',
185+
dockerImage : 'windows2022_build_image',
186+
dockerRegistry : 'https://adoptium.azurecr.io',
187+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
182188
crossCompile : 'x64',
183189
additionalNodeLabels: 'win2022&&vs2022',
184190
test : 'default',

‎pipelines/jobs/configurations/jdk21u_pipeline_config.groovy‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ class Config21 {
6868
x64Windows: [
6969
os : 'windows',
7070
arch : 'x64',
71-
dockerImage : 'win2022_notrhel_image',
71+
dockerImage : 'windows2022_build_image',
72+
dockerRegistry : 'https://adoptium.azurecr.io',
73+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
7274
additionalNodeLabels: 'win2022&&vs2022',
7375
test: [
7476
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 {
164166
aarch64Windows: [
165167
os : 'windows',
166168
arch : 'aarch64',
167-
dockerImage : 'win2022_notrhel_image',
169+
dockerImage : 'windows2022_build_image',
170+
dockerRegistry : 'https://adoptium.azurecr.io',
171+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
168172
crossCompile : 'x64',
169173
additionalNodeLabels: 'win2022&&vs2022',
170174
test : 'default',

‎pipelines/jobs/configurations/jdk23u_pipeline_config.groovy‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ class Config23 {
6969
x64Windows: [
7070
os : 'windows',
7171
arch : 'x64',
72-
dockerImage : 'win2022_notrhel_image',
72+
dockerImage : 'windows2022_build_image',
73+
dockerRegistry : 'https://adoptium.azurecr.io',
74+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
7375
additionalNodeLabels: 'win2022&&vs2022',
7476
test: [
7577
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 {
165167
aarch64Windows: [
166168
os : 'windows',
167169
arch : 'aarch64',
168-
dockerImage : 'win2022_notrhel_image',
170+
dockerImage : 'windows2022_build_image',
171+
dockerRegistry : 'https://adoptium.azurecr.io',
172+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
169173
crossCompile : 'x64',
170174
additionalNodeLabels: 'win2022&&vs2022',
171175
test : 'default',

‎pipelines/jobs/configurations/jdk24_pipeline_config.groovy‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ class Config24 {
6969
x64Windows: [
7070
os : 'windows',
7171
arch : 'x64',
72-
dockerImage : 'win2022_notrhel_image',
72+
dockerImage : 'windows2022_build_image',
73+
dockerRegistry : 'https://adoptium.azurecr.io',
74+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
7375
additionalNodeLabels: 'win2022&&vs2022',
7476
test: [
7577
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 {
165167
aarch64Windows: [
166168
os : 'windows',
167169
arch : 'aarch64',
168-
dockerImage : 'win2022_notrhel_image',
170+
dockerImage : 'windows2022_build_image',
171+
dockerRegistry : 'https://adoptium.azurecr.io',
172+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
169173
crossCompile : 'x64',
170174
additionalNodeLabels: 'win2022&&vs2022',
171175
test : 'default',

‎pipelines/jobs/configurations/jdk25_pipeline_config.groovy‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ class Config25 {
6969
x64Windows: [
7070
os : 'windows',
7171
arch : 'x64',
72-
dockerImage : 'win2022_notrhel_image',
72+
dockerImage : 'windows2022_build_image',
73+
dockerRegistry : 'https://adoptium.azurecr.io',
74+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
7375
additionalNodeLabels: 'win2022&&vs2022',
7476
test: [
7577
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 {
165167
aarch64Windows: [
166168
os : 'windows',
167169
arch : 'aarch64',
168-
dockerImage : 'win2022_notrhel_image',
170+
dockerImage : 'windows2022_build_image',
171+
dockerRegistry : 'https://adoptium.azurecr.io',
172+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
169173
crossCompile : 'x64',
170174
additionalNodeLabels: 'win2022&&vs2022',
171175
test : 'default',

‎pipelines/jobs/configurations/jdk8u_pipeline_config.groovy‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ class Config8 {
6868
x64Windows : [
6969
os : 'windows',
7070
arch : 'x64',
71-
dockerImage : 'win2022_notrhel_image',
71+
dockerImage : 'windows2022_build_image',
72+
dockerRegistry : 'https://adoptium.azurecr.io',
73+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
7274
additionalNodeLabels: 'win2022&&vs2022',
7375
test : 'default',
7476
configureArgs : [
@@ -82,7 +84,9 @@ class Config8 {
8284
x32Windows : [
8385
os : 'windows',
8486
arch : 'x86-32',
85-
dockerImage : 'win2022_notrhel_image',
87+
dockerImage : 'windows2022_build_image',
88+
dockerRegistry : 'https://adoptium.azurecr.io',
89+
dockerCredential : 'bbb9fa70-a1de-4853-b564-5f02193329ac',
8690
additionalNodeLabels: 'win2022',
8791
configureArgs : [
8892
'temurin' : '--disable-ccache'

0 commit comments

Comments
 (0)