Skip to content

Commit

Permalink
feat: add support for prototype jobs/pipelines
Browse files Browse the repository at this point in the history 
	- add back aarch64Windows for 11,17,19,20
	- move non-temurin variants into prototype config
  • Loading branch information
@zdtsw
zdtsw committed Nov 29, 2022
1 parent cf8c677 commit 948ebdf
Show file tree
Hide file tree
Showing 15 changed files with 164 additions and 67 deletions.
1 change: 1 addition & 0 deletions pipelines/defaults.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"build" : "pipelines/jobs/configurations",
"nightly" : "pipelines/jobs/configurations",
"release" : "pipelines/jobs/configurations",
"prototype" : "pipelines/jobs/configurations",
"platform" : "build-farm/platform-specific-configurations"
},
"scriptDirectories" : {
Expand Down
22 changes: 11 additions & 11 deletions pipelines/jobs/configurations/jdk11u.groovy
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
targetConfigurations = [
'x64Mac' : [ 'temurin', 'openj9' ],
'x64Linux' : [ 'temurin', 'openj9', 'dragonwell', 'corretto', 'bisheng', 'fast_startup'],
'x64AlpineLinux': [ 'temurin' ],
'x64Windows' : [ 'temurin', 'openj9', 'dragonwell' ],
'x32Windows' : [ 'temurin' ],
'ppc64Aix' : [ 'temurin', 'openj9' ],
'ppc64leLinux' : [ 'temurin', 'openj9' ],
's390xLinux' : [ 'temurin', 'openj9' ],
'aarch64Linux' : [ 'temurin', 'openj9', 'dragonwell', 'bisheng' ],
'aarch64Mac' : [ 'temurin', ],
'arm32Linux' : [ 'temurin' ]
'x64Mac' : [ 'temurin'],
'x64Linux' : [ 'temurin'],
'x64AlpineLinux': [ 'temurin'],
'x64Windows' : [ 'temurin'],
'x32Windows' : [ 'temurin'],
'ppc64Aix' : [ 'temurin'],
'ppc64leLinux' : [ 'temurin'],
's390xLinux' : [ 'temurin'],
'aarch64Linux' : [ 'temurin'],
'aarch64Mac' : [ 'temurin'],
'arm32Linux' : [ 'temurin']
]

// 18:05 Tue, Thur
Expand Down
11 changes: 11 additions & 0 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,17 @@ class Config11 {
nightly: ['sanity.openjdk'],
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
],
],

aarch64Windows: [
os : 'windows',
arch : 'aarch64',
crossCompile : 'x64',
additionalNodeLabels: 'win2016&&vs2019',
test : false,
buildArgs : [
'temurin' : '--jvm-variant client,server --create-sbom --cross-compile'
]
]
]

Expand Down
11 changes: 11 additions & 0 deletions pipelines/jobs/configurations/jdk11u_prototype.groovy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
targetConfigurations = [
'x64Mac' : [ 'openj9' ],
'x64Linux' : [ 'openj9', 'dragonwell', 'corretto', 'bisheng', 'fast_startup'],
'x64Windows' : [ 'openj9', 'dragonwell' ],
'ppc64Aix' : [ 'openj9' ],
'ppc64leLinux' : [ 'openj9' ],
's390xLinux' : [ 'openj9' ],
'aarch64Linux' : [ 'openj9', 'dragonwell', 'bisheng' ],
'aarch64Windows': [ 'temurin' ]
]
return this
25 changes: 7 additions & 18 deletions pipelines/jobs/configurations/jdk17u.groovy
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,30 @@
targetConfigurations = [
'x64Mac' : [
'temurin',
'openj9'
'temurin'
],
'x64Linux' : [
'temurin',
'openj9',
'bisheng'
'temurin'
],
'x64AlpineLinux' : [
'temurin'
],
'x64Windows' : [
'temurin',
'openj9'
'temurin'
],
'x32Windows' : [
'temurin'
],
'ppc64Aix' : [
'temurin',
'openj9'
'temurin'
],
'ppc64leLinux': [
'temurin',
'openj9'
'temurin'
],
's390xLinux' : [
'temurin',
'openj9'
'temurin'
],
'aarch64Linux': [
'temurin',
'openj9',
'bisheng'
'temurin'
],
'aarch64AlpineLinux' : [
'temurin'
Expand All @@ -55,8 +46,6 @@ triggerSchedule_weekly = 'TZ=UTC\n05 12 * * 7'
weekly_release_scmReferences = [
'temurin' : '',
'openj9' : '',
'corretto' : '',
'dragonwell' : '',
'bisheng' : ''
]

Expand Down
12 changes: 11 additions & 1 deletion pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,18 @@ class Config17 {
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
]
]
],

aarch64Windows: [
os : 'windows',
arch : 'aarch64',
crossCompile : 'x64',
additionalNodeLabels: 'win2016&&vs2019',
test : false,
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --cross-compile'
]
]
]

}
Expand Down
30 changes: 30 additions & 0 deletions pipelines/jobs/configurations/jdk17u_prototype.groovy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
targetConfigurations = [
'aarch64Windows': [
'temurin'
],
'x64Mac' : [
'openj9'
],
'x64Linux' : [
'openj9',
'bisheng'
],
'x64Windows' : [
'openj9'
],
'ppc64Aix' : [
'openj9'
],
'ppc64leLinux': [
'openj9'
],
's390xLinux' : [
'openj9'
],
'aarch64Linux': [
'openj9',
'bisheng'
]
]

return this
6 changes: 1 addition & 5 deletions pipelines/jobs/configurations/jdk19u.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,7 @@ triggerSchedule_weekly = 'TZ=UTC\n05 17 * * 7'

// scmReferences to use for weekly release build
weekly_release_scmReferences = [
'hotspot' : '',
'temurin' : '',
'openj9' : '',
'corretto' : '',
'dragonwell' : ''
'temurin' : ''
]

return this
13 changes: 12 additions & 1 deletion pipelines/jobs/configurations/jdk19u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,19 @@ class Config19 {
nightly: ['sanity.openjdk'],
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
]
]
],

aarch64Windows: [
os : 'windows',
arch : 'aarch64',
crossCompile : 'x64',
additionalNodeLabels: 'win2016&&vs2019',
test : false,
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --cross-compile'
]

]
]

}
Expand Down
4 changes: 4 additions & 0 deletions pipelines/jobs/configurations/jdk19u_prototype.groovy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
targetConfigurations = [
'aarch64Windows': [ 'temurin' ]
]
return this
6 changes: 1 addition & 5 deletions pipelines/jobs/configurations/jdk20.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ targetConfigurations = [
'temurin'
],
'aarch64Linux': [
'hotspot',
'temurin'
],
'aarch64AlpineLinux' : [
Expand All @@ -47,10 +46,7 @@ triggerSchedule_weekly = 'TZ=UTC\n30 23 * * 6'
// scmReferences to use for weekly release build
weekly_release_scmReferences = [
'hotspot' : '',
'temurin' : '',
'openj9' : '',
'corretto' : '',
'dragonwell' : ''
'temurin' : ''
]

return this
13 changes: 12 additions & 1 deletion pipelines/jobs/configurations/jdk20_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,19 @@ class Config20 {
nightly: ['sanity.openjdk'],
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf']
]
]
],

aarch64Windows: [
os : 'windows',
arch : 'aarch64',
crossCompile : 'x64',
additionalNodeLabels: 'win2016&&vs2019',
test : false,
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --cross-compile'
]

]
]

}
Expand Down
9 changes: 9 additions & 0 deletions pipelines/jobs/configurations/jdk20_prototype.groovy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
targetConfigurations = [
'aarch64Linux': [
'hotspot'
],
'aarch64Windows' : [
'temurin'
]
]
return this
33 changes: 8 additions & 25 deletions pipelines/jobs/configurations/jdk8u.groovy
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,32 @@
targetConfigurations = [
'x64Mac' : [
'temurin',
'openj9'
'temurin'
],
'x64Linux' : [
'temurin',
'openj9',
'corretto',
'dragonwell',
'bisheng'
'temurin'
],
'x64AlpineLinux' : [
'temurin'
],
'x32Windows' : [
'temurin',
'openj9'
'temurin'
],
'x64Windows' : [
'temurin',
'openj9',
'dragonwell'
'temurin'
],
'ppc64Aix' : [
'temurin',
'openj9'
'temurin'
],
'ppc64leLinux' : [
'temurin',
'openj9'
'temurin'
],
's390xLinux' : [
'temurin',
'openj9'
'temurin'
],
'aarch64Linux' : [
'temurin',
'openj9',
'dragonwell',
'bisheng'
],
'aarch64AlpineLinux' : [
'temurin'
],
'arm32Linux' : [
'aarch64AlpineLinux' : [
'temurin'
],
'x64Solaris': [
Expand Down
35 changes: 35 additions & 0 deletions pipelines/jobs/configurations/jdk8u_prototype.groovy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
targetConfigurations = [
'x64Mac' : [
'openj9'
],
'x64Linux' : [
'openj9',
'corretto',
'dragonwell',
'bisheng'
],
'x32Windows' : [
'openj9'
],
'x64Windows' : [
'openj9',
'dragonwell'
],
'ppc64Aix' : [
'openj9'
],
'ppc64leLinux' : [
'openj9'
],
's390xLinux' : [
'openj9'
],
'aarch64Linux' : [
'openj9',
'dragonwell',
'bisheng'
]
]


return this

0 comments on commit 948ebdf

Please sign in to comment.