Skip to content

Commit

Permalink
Enalbe jdk17 aarch64 reproducible comparison build (#742)
Browse files Browse the repository at this point in the history
Signed-off-by: Sophia Guo <[email protected]>
  • Loading branch information
sophia-guo authored Jun 30, 2023
1 parent 001f5fb commit 5f91624
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
8 changes: 2 additions & 6 deletions pipelines/build/common/openjdk_build_pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -591,11 +591,7 @@ class Build {
def jobName = "${env.JOB_NAME}"
jobName = jobName.substring(jobName.lastIndexOf('/')+1)
jobName = "${jobName}_reproduce_compare"
if (getJavaVersionNumber() == 17 &&
buildConfig.ARCHITECTURE.contains('x64') &&
buildConfig.TARGET_OS.contains('linux') &&
buildConfig.VARIANT == 'temurin' &&
!Boolean.valueOf(buildConfig.RELEASE)) {
if (!Boolean.valueOf(buildConfig.RELEASE)) {
// For now set the build as independent, no need to wait for result as the build takes time
context.stage('Reproduce Compare') {
def buildParams = context.params.toString()
Expand Down Expand Up @@ -1726,6 +1722,7 @@ class Build {
context.println "Executing tests: ${buildConfig.TEST_LIST}"
context.println "Build num: ${env.BUILD_NUMBER}"
context.println "File name: ${filename}"

def enableReproducibleCompare = Boolean.valueOf(buildConfig.ENABLE_REPRODUCIBLE_COMPARE)
def enableTests = Boolean.valueOf(buildConfig.ENABLE_TESTS)
def enableInstallers = Boolean.valueOf(buildConfig.ENABLE_INSTALLERS)
Expand All @@ -1735,7 +1732,6 @@ class Build {
def cleanWorkspace = Boolean.valueOf(buildConfig.CLEAN_WORKSPACE)
def cleanWorkspaceAfter = Boolean.valueOf(buildConfig.CLEAN_WORKSPACE_AFTER)
def cleanWorkspaceBuildOutputAfter = Boolean.valueOf(buildConfig.CLEAN_WORKSPACE_BUILD_OUTPUT_ONLY_AFTER)

// Get branch/tag of temurin-build, ci-jenkins-pipeline and jenkins-helper repo from BUILD_CONFIGURATION or defaultsJson
def helperRef = buildConfig.HELPER_REF ?: DEFAULTS_JSON['repository']['helper_ref']

Expand Down
3 changes: 3 additions & 0 deletions pipelines/jobs/configurations/jdk17u_pipeline_config.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ class Config17 {
dockerImage : 'adoptopenjdk/centos7_build_image',
test : 'default',
configureArgs : '--enable-dtrace',
reproducibleCompare : [
'temurin' : true
],
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
]
Expand Down

0 comments on commit 5f91624

Please sign in to comment.