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

AIX: Update JDK8, 11, 17 to build and test on 7.2 #622

Merged
merged 1 commit into from
Apr 12, 2023
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
6 changes: 2 additions & 4 deletions pipelines/jobs/configurations/jdk11u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,9 @@ class Config11 {
ppc64Aix : [
os : 'aix',
arch : 'ppc64',
additionalNodeLabels: [
temurin: 'xlc16&&aix710',
openj9: 'xlc16&&aix715'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was the change from xlc16 to xlc13 intended for 11/17?

Copy link
Member Author

@sxa sxa Apr 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, but all machines should have both compilers installed regardless and this isn't where the compiler to use is selected. Should probably have another PR to fix it though.

],
additionalNodeLabels: 'xlc13&&aix720',
test : 'default',
additionalTestLabels: 'sw.os.aix.7_2',
cleanWorkspaceAfterBuild: true,
buildArgs : [
'temurin' : '--create-sbom'
Expand Down
6 changes: 2 additions & 4 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,9 @@ class Config17 {
ppc64Aix : [
os : 'aix',
arch : 'ppc64',
additionalNodeLabels: [
temurin: 'xlc16&&aix710',
openj9: 'xlc16&&aix715'
],
additionalNodeLabels: 'xlc13&&aix720',
test : 'default',
additionalTestLabels: 'sw.os.aix.7_2',
cleanWorkspaceAfterBuild: true,
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
Expand Down
6 changes: 2 additions & 4 deletions pipelines/jobs/configurations/jdk8u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,9 @@ class Config8 {
ppc64Aix : [
os : 'aix',
arch: 'ppc64',
additionalNodeLabels: [
temurin: 'xlc13&&aix710',
openj9: 'xlc13&&aix715'
],
additionalNodeLabels: 'xlc13&&aix720',
test : 'default',
additionalTestLabels : 'sw.os.aix.7_2',
cleanWorkspaceAfterBuild: true,
buildArgs : [
'temurin' : '--create-sbom'
Expand Down