Skip to content

Commit

Permalink
Merge pull request adoptium#163 from mardekanian/issue-7907
Browse files Browse the repository at this point in the history 
Issue 7907
  • Loading branch information
@AdamBrousseau
AdamBrousseau authored Jun 19, 2023
2 parents 5203756 + bf5fc3c commit ede41ea
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Config11 {
x64Mac : [
os : 'mac',
arch : 'x64',
additionalNodeLabels : 'ci.project.openj9 && hw.arch.x86 && sw.os.osx.10_15',
additionalNodeLabels : 'ci.project.openj9 && hw.arch.x86 && sw.os.mac.10_15',
test : 'default',
configureArgs : [
'openj9' : '--enable-dtrace=auto --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition"',
Expand Down Expand Up @@ -237,7 +237,7 @@ class Config11 {
x64MacIBM : [
os : 'mac',
arch : 'x64',
additionalNodeLabels : 'ci.project.openj9 && hw.arch.x86 && sw.os.osx.10_15',
additionalNodeLabels : 'ci.project.openj9 && hw.arch.x86 && sw.os.mac.10_15',
test : [
nightly: [
'sanity.functional',
Expand Down
2 changes: 1 addition & 1 deletion pipelines/jobs/configurations/jdk16u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Config16 {
x64Mac : [
os : 'mac',
arch : 'x64',
additionalNodeLabels: 'ci.project.openj9 && hw.arch.x86 && sw.os.osx.10_14',
additionalNodeLabels: 'ci.project.openj9 && hw.arch.x86 && sw.os.mac.10_14',
test : 'default',
cleanWorkspaceAfterBuild: true,
configureArgs : '--enable-dtrace --with-vendor-name="International Business Machines Corporation" --with-vendor-version-string="16.0.2.0" --with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition" --with-vendor-url=https://www.ibm.com/ --with-vendor-bug-url=https://github.com/eclipse-openj9/openj9/issues --with-vendor-vm-bug-url=https://github.com/eclipse-openj9/openj9/issues'
Expand Down
6 changes: 3 additions & 3 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ class Config17 {
x64Mac : [
os : 'mac',
arch : 'x64',
additionalNodeLabels: 'ci.project.openj9 && hw.arch.x86 && sw.os.osx.10_15',
additionalNodeLabels: 'ci.project.openj9 && hw.arch.x86 && sw.os.mac.10_15',
additionalTestLabels: [
openj9 : '!sw.os.osx.10_11'
openj9 : '!sw.os.mac.10_11'
],
test : 'default',
cleanWorkspaceAfterBuild: true,
Expand Down Expand Up @@ -235,7 +235,7 @@ class Config17 {
x64MacIBM : [
os : 'mac',
arch : 'x64',
additionalNodeLabels : 'ci.project.openj9 && hw.arch.x86 && sw.os.osx.10_15',
additionalNodeLabels : 'ci.project.openj9 && hw.arch.x86 && sw.os.mac.10_15',
test : 'default',
cleanWorkspaceAfterBuild: true,
configureArgs : [
Expand Down
4 changes: 2 additions & 2 deletions pipelines/jobs/configurations/jdk18u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ class Config18 {
x64Mac : [
os : 'mac',
arch : 'x64',
additionalNodeLabels: 'ci.project.openj9 && hw.arch.x86 && sw.os.osx.10_15',
additionalNodeLabels: 'ci.project.openj9 && hw.arch.x86 && sw.os.mac.10_15',
additionalTestLabels: [
openj9 : '!sw.os.osx.10_11'
openj9 : '!sw.os.mac.10_11'
],
test : 'default',
cleanWorkspaceAfterBuild: true,
Expand Down
4 changes: 2 additions & 2 deletions pipelines/jobs/configurations/jdk19u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ class Config19 {
x64Mac : [
os : 'mac',
arch : 'x64',
additionalNodeLabels: 'hw.arch.x86 && sw.os.osx.10_15',
additionalNodeLabels: 'hw.arch.x86 && sw.os.mac.10_15',
additionalTestLabels: [
openj9 : '!sw.os.osx.10_11'
openj9 : '!sw.os.mac.10_11'
],
test : 'default',
cleanWorkspaceAfterBuild: true,
Expand Down
4 changes: 2 additions & 2 deletions pipelines/jobs/configurations/jdk20u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ class Config20 {
os : 'mac',
arch : 'x64',
additionalNodeLabels: [
openj9 : 'hw.arch.x86 && sw.os.osx.10_15',
openj9 : 'hw.arch.x86 && sw.os.mac.10_15',
temurin : 'macos10.14'
],
additionalTestLabels: [
openj9 : '!sw.os.osx.10_11'
openj9 : '!sw.os.mac.10_11'
],
test : 'default',
cleanWorkspaceAfterBuild: true,
Expand Down
2 changes: 1 addition & 1 deletion pipelines/jobs/configurations/jdk21_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Config21 {
arch : 'x64',
additionalNodeLabels: 'macos10.14',
additionalTestLabels: [
openj9 : '!sw.os.osx.10_11'
openj9 : '!sw.os.mac.10_11'
],
test : 'default',
configureArgs : '--enable-dtrace',
Expand Down
2 changes: 1 addition & 1 deletion pipelines/jobs/configurations/jdk22_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Config22 {
arch : 'x64',
additionalNodeLabels: 'macos10.14',
additionalTestLabels: [
openj9 : '!sw.os.osx.10_11'
openj9 : '!sw.os.mac.10_11'
],
test : 'default',
configureArgs : '--enable-dtrace',
Expand Down
2 changes: 1 addition & 1 deletion pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class Config8 {
additionalNodeLabels: [
temurin : 'macos10.14',
corretto: 'build-macstadium-macos1010-1',
openj9 : 'ci.project.openj9 && hw.arch.x86 && sw.os.osx.10_15'
openj9 : 'ci.project.openj9 && hw.arch.x86 && sw.os.mac.10_15'
],
cleanWorkspaceAfterBuild: true,
configureArgs : '--with-product-name="IBM Semeru Runtime" --with-product-suffix="Open Edition"',
Expand Down

0 comments on commit ede41ea

Please sign in to comment.