Skip to content

Commit

Permalink
windows: switch to running builds in docker containers (#1155)
Browse files Browse the repository at this point in the history
Signed-off-by: Stewart X Addison <sxa@redhat.com>
  • Loading branch information
sxa authored Dec 4, 2024
1 parent 562ec67 commit fb9c821
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 0 deletions.
3 changes: 3 additions & 0 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ class Config11 {
x64Windows: [
os : 'windows',
arch : 'x64',
dockerImage : 'win2022_notrhel_image',
additionalNodeLabels: [
temurin: 'win2022&&vs2022',
openj9: 'win2012&&vs2017',
Expand All @@ -87,6 +88,7 @@ class Config11 {
x32Windows: [
os : 'windows',
arch : 'x86-32',
dockerImage : 'win2022_notrhel_image',
additionalNodeLabels: 'win2022&&vs2022',
configureArgs : [
'temurin' : '--disable-ccache'
Expand Down Expand Up @@ -246,6 +248,7 @@ class Config11 {
aarch64Windows: [
os : 'windows',
arch : 'aarch64',
dockerImage : 'win2022_notrhel_image',
crossCompile : 'x64',
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
Expand Down
3 changes: 3 additions & 0 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ class Config17 {
x64Windows: [
os : 'windows',
arch : 'x64',
dockerImage : 'win2022_notrhel_image',
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
buildArgs : [
Expand All @@ -78,6 +79,7 @@ class Config17 {
x32Windows: [
os : 'windows',
arch : 'x86-32',
dockerImage : 'win2022_notrhel_image',
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
buildArgs : [
Expand Down Expand Up @@ -176,6 +178,7 @@ class Config17 {
aarch64Windows: [
os : 'windows',
arch : 'aarch64',
dockerImage : 'win2022_notrhel_image',
crossCompile : 'x64',
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
Expand Down
2 changes: 2 additions & 0 deletions pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ class Config21 {
x64Windows: [
os : 'windows',
arch : 'x64',
dockerImage : 'win2022_notrhel_image',
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 @@ -161,6 +162,7 @@ class Config21 {
aarch64Windows: [
os : 'windows',
arch : 'aarch64',
dockerImage : 'win2022_notrhel_image',
crossCompile : 'x64',
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
Expand Down
2 changes: 2 additions & 0 deletions pipelines/jobs/configurations/jdk23u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class Config23 {
x64Windows: [
os : 'windows',
arch : 'x64',
dockerImage : 'win2022_notrhel_image',
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 @@ -162,6 +163,7 @@ class Config23 {
aarch64Windows: [
os : 'windows',
arch : 'aarch64',
dockerImage : 'win2022_notrhel_image',
crossCompile : 'x64',
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
Expand Down
2 changes: 2 additions & 0 deletions pipelines/jobs/configurations/jdk24_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class Config24 {
x64Windows: [
os : 'windows',
arch : 'x64',
dockerImage : 'win2022_notrhel_image',
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 @@ -162,6 +163,7 @@ class Config24 {
aarch64Windows: [
os : 'windows',
arch : 'aarch64',
dockerImage : 'win2022_notrhel_image',
crossCompile : 'x64',
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
Expand Down
2 changes: 2 additions & 0 deletions pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ class Config8 {
x64Windows : [
os : 'windows',
arch : 'x64',
dockerImage : 'win2022_notrhel_image',
additionalNodeLabels: 'win2022&&vs2022',
test : 'default',
configureArgs : [
Expand All @@ -81,6 +82,7 @@ class Config8 {
x32Windows : [
os : 'windows',
arch : 'x86-32',
dockerImage : 'win2022_notrhel_image',
additionalNodeLabels: 'win2022',
configureArgs : [
'temurin' : '--disable-ccache'
Expand Down

0 comments on commit fb9c821

Please sign in to comment.