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.

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

stop requiring mingw labels on Openj9 JDK8+11 builds #79

Merged
merged 1 commit into from
Mar 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,7 @@ class Config11 {
x32Windows: [
os : 'windows',
arch : 'x86-32',
additionalNodeLabels: [
hotspot: 'win2012',
openj9: 'win2012&&mingw-standalone'
],
additionalNodeLabels: 'win2012',
buildArgs : [
hotspot : '--jvm-variant client,server'
],
Expand Down
15 changes: 3 additions & 12 deletions pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,14 @@ class Config8 {
x64Windows : [
os : 'windows',
arch : 'x64',
additionalNodeLabels: [
hotspot : 'win2012',
corretto: 'win2012',
openj9 : 'win2012&&mingw-cygwin',
dragonwell: 'win2012'
],
additionalNodeLabels: 'win2012',
test : 'default'
],

x64WindowsXL : [
os : 'windows',
arch : 'x64',
additionalNodeLabels : 'win2012&&mingw-cygwin',
additionalNodeLabels : 'win2012',
test : 'default',
additionalFileNameTag: "windowsXL",
configureArgs : '--with-noncompressedrefs'
Expand All @@ -59,11 +54,7 @@ class Config8 {
x32Windows : [
os : 'windows',
arch : 'x86-32',
additionalNodeLabels: [
hotspot : 'win2012',
corretto: 'win2012',
openj9 : 'win2012&&mingw-cygwin'
],
additionalNodeLabels: 'win2012',
buildArgs : [
hotspot : '--jvm-variant client,server'
],
Expand Down