Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch windows builds to use docker image from azurecr #1170

Merged
merged 3 commits into from
Dec 20, 2024
Merged

switch windows builds to use docker image from azurecr #1170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1414761
switch windows builds to use docker image from azurecr
sxa Dec 19, 2024
3873041
Merge branch 'master' into windocker_azurecr
sxa Dec 19, 2024
1719d79
fix type in image name
sxa Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading