Skip to content

Commit

Permalink
Update jdk23 and add jdk24 pipeline configurations (#1047)
Browse files Browse the repository at this point in the history 
* Update jdk23 and add jdk24 pipeline configurations

Signed-off-by: Andrew Leonard <[email protected]>

* pr-tester failing due to AQAvit tap file archive failure

Signed-off-by: Andrew Leonard <[email protected]>

* Update jdk23 and add jdk24 pipeline configurations

Signed-off-by: Andrew Leonard <[email protected]>

---------

Signed-off-by: Andrew Leonard <[email protected]>
  • Loading branch information
@andrew-m-leonard
andrew-m-leonard authored Jun 21, 2024
1 parent 701ada8 commit cca48ca
Show file tree
Hide file tree
Showing 8 changed files with 311 additions and 12 deletions.
13 changes: 9 additions & 4 deletions pipelines/build/common/build_base_file.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -968,11 +968,16 @@ class Builder implements Serializable {
throw new Exception("[ERROR] Archive artifact timeout (${pipelineTimeouts.ARCHIVE_ARTIFACTS_TIMEOUT} HOURS) for ${downstreamJobName}has been reached. Exiting...")
}

// Archive tap files as a single tar file
context.sh "find . -type f -name '*.tap' -exec tar -czf AQAvitTapFiles.tar.gz {} + "
// Archive any tap files (if any tests ran that produce them) from the build job as a single tar file
context.sh "find target/${config.TARGET_OS}/${config.ARCHITECTURE}/${config.VARIANT}/AQAvitTaps -type f -name '*.tap' -exec tar -czf target/${config.TARGET_OS}/${config.ARCHITECTURE}/${config.VARIANT}/AQAvitTaps/AQAvitTapFiles.tar.gz {} + "
try {
context.timeout(time: pipelineTimeouts.ARCHIVE_ARTIFACTS_TIMEOUT, unit: 'HOURS') {
context.archiveArtifacts artifacts: "AQAvitTapFiles.tar.gz"
// Archive if any tap files were found
if (context.fileExists("target/${config.TARGET_OS}/${config.ARCHITECTURE}/${config.VARIANT}/AQAvitTaps/AQAvitTapFiles.tar.gz")) {
context.timeout(time: pipelineTimeouts.ARCHIVE_ARTIFACTS_TIMEOUT, unit: 'HOURS') {
context.archiveArtifacts artifacts: "AQAvitTapFiles.tar.gz"
}
} else {
context.println "No AQAvit tap files found to archive for target/${config.TARGET_OS}/${config.ARCHITECTURE}/${config.VARIANT}"
}
} catch (FlowInterruptedException e) {
throw new Exception("[ERROR] Archive AQAvitTapFiles.tar.gz timeout Exiting...")
Expand Down
7 changes: 2 additions & 5 deletions pipelines/jobs/configurations/jdk23.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,8 @@ targetConfigurations = [
'aarch64Mac': [
'temurin'
],
'arm32Linux' : [
'hotspot'
],
'x32Windows' : [
'hotspot'
'riscv64Linux': [
'temurin'
]
]

Expand Down
3 changes: 0 additions & 3 deletions pipelines/jobs/configurations/jdk23_evaluation.groovy
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
targetConfigurations = [
'riscv64Linux': [
'temurin'
],
'aarch64Windows' : [
'temurin'
]
Expand Down
37 changes: 37 additions & 0 deletions pipelines/jobs/configurations/jdk23_release.groovy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
targetConfigurations = [
'x64Mac' : [
'temurin'
],
'x64Linux' : [
'temurin'
],
'x64AlpineLinux' : [
'temurin'
],
'aarch64AlpineLinux' : [
'temurin'
],
'x64Windows' : [
'temurin'
],
'ppc64Aix' : [
'temurin'
],
'ppc64leLinux': [
'temurin'
],
's390xLinux' : [
'temurin'
],
'aarch64Linux': [
'temurin'
],
'aarch64Mac': [
'temurin'
],
'riscv64Linux': [
'temurin'
]
]

return this
47 changes: 47 additions & 0 deletions pipelines/jobs/configurations/jdk24.groovy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
targetConfigurations = [
'x64Mac' : [
'temurin'
],
'x64Linux' : [
'temurin'
],
'x64AlpineLinux' : [
'temurin'
],
'aarch64AlpineLinux' : [
'temurin'
],
'x64Windows' : [
'temurin'
],
'ppc64Aix' : [
'temurin'
],
'ppc64leLinux': [
'temurin'
],
's390xLinux' : [
'temurin'
],
'aarch64Linux': [
'hotspot',
'temurin'
],
'aarch64Mac': [
'temurin'
],
'riscv64Linux': [
'temurin'
]
]

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

return this
13 changes: 13 additions & 0 deletions pipelines/jobs/configurations/jdk24_evaluation.groovy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
targetConfigurations = [
'aarch64Windows' : [
'temurin'
]
]

// scmReferences to use for weekly evaluation release build
weekly_evaluation_scmReferences = [
'hotspot' : '',
'temurin' : ''
]

return this
166 changes: 166 additions & 0 deletions pipelines/jobs/configurations/jdk24_pipeline_config.groovy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
class Config24 {

final Map<String, Map<String, ?>> buildConfigurations = [
x64Mac : [
os : 'mac',
arch : 'x64',
additionalNodeLabels: 'xcode15.0.1',
additionalTestLabels: [
openj9 : '!sw.os.osx.10_11',
temurin : '!sw.os.osx.10_14'
],
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
]
],

x64Linux : [
os : 'linux',
arch : 'x64',
dockerImage : 'adoptopenjdk/centos7_build_image',
dockerFile: [
openj9 : 'pipelines/build/dockerFiles/cuda.dockerfile'
],
test: [
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'dev.openjdk', 'dev.functional', 'dev.system', 'special.system']
],
additionalTestLabels: [
openj9 : '!(centos6||rhel6)',
temurin : '!(centos6||rhel6)'
],
configureArgs : [
'openj9' : '--enable-dtrace',
'temurin' : '--enable-dtrace'
],
buildArgs : [
'temurin' : '--create-source-archive --create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b02'
]
],

x64AlpineLinux : [
os : 'alpine-linux',
arch : 'x64',
dockerImage : 'adoptopenjdk/alpine3_build_image',
test : 'default',
configureArgs : '--enable-headless-only=yes',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
]
],

aarch64AlpineLinux : [
os : 'alpine-linux',
arch : 'aarch64',
dockerImage : 'adoptopenjdk/alpine3_build_image',
test : 'default',
configureArgs : '--enable-headless-only=yes',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
]
],

x64Windows: [
os : 'windows',
arch : 'x64',
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']
],
configureArgs : "--with-ucrt-dll-dir='C:/progra~2/wi3cf2~1/10/Redist/10.0.22621.0/ucrt/DLLs/x64'",
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
]
],

ppc64Aix : [
os : 'aix',
arch : 'ppc64',
additionalNodeLabels: [
temurin: 'openxl17&&aix720',
openj9: 'xlc16&&aix715'
],
test : 'default',
additionalTestLabels: [
temurin : 'sw.os.aix.7_2TL5'
],
cleanWorkspaceAfterBuild: true,
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
]
],

s390xLinux : [
os : 'linux',
arch : 's390x',
dockerImage : 'rhel7_build_image',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit s390x-on-s390x.RH7'
]
],

ppc64leLinux : [
os : 'linux',
arch : 'ppc64le',
dockerImage : 'adoptopenjdk/centos7_build_image',
test : 'default',
configureArgs : [
'openj9' : '--enable-dtrace'
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b02'
]
],

aarch64Linux : [
os : 'linux',
arch : 'aarch64',
dockerImage : 'adoptopenjdk/centos7_build_image',
test : 'default',
configureArgs : '--enable-dtrace',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom --use-adoptium-devkit gcc-11.3.0-Centos7.6.1810-b02'
]
],

aarch64Mac: [
os : 'mac',
arch : 'aarch64',
additionalNodeLabels: 'xcode15.0.1',
test : 'default',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
]
],

riscv64Linux : [
os : 'linux',
arch : 'riscv64',
crossCompile : 'qemustatic',
dockerImage : 'adoptopenjdk/ubuntu2004_build_image:linux-riscv64',
dockerArgs : '--platform linux/riscv64',
test : 'default',
configureArgs : '--enable-headless-only=yes --enable-dtrace',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
]
],

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

}

Config24 config = new Config24()
return config.buildConfigurations
37 changes: 37 additions & 0 deletions pipelines/jobs/configurations/jdk24_release.groovy
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
targetConfigurations = [
'x64Mac' : [
'temurin'
],
'x64Linux' : [
'temurin'
],
'x64AlpineLinux' : [
'temurin'
],
'aarch64AlpineLinux' : [
'temurin'
],
'x64Windows' : [
'temurin'
],
'ppc64Aix' : [
'temurin'
],
'ppc64leLinux': [
'temurin'
],
's390xLinux' : [
'temurin'
],
'aarch64Linux': [
'temurin'
],
'aarch64Mac': [
'temurin'
],
'riscv64Linux': [
'temurin'
]
]

return this

0 comments on commit cca48ca

Please sign in to comment.