From 771d62ffb200ae994b7b22eace2aed7f4bb2eb8c Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Tue, 27 Jun 2023 15:57:55 -0400 Subject: [PATCH] Enalbe jdk17 aarch64 reproducible comparison build Signed-off-by: Sophia Guo --- pipelines/build/common/openjdk_build_pipeline.groovy | 8 ++------ .../jobs/configurations/jdk17u_pipeline_config.groovy | 3 +++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index 4420170b5..8d8c9e737 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -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() @@ -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) @@ -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'] diff --git a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy index 272e95653..d84850072 100644 --- a/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy +++ b/pipelines/jobs/configurations/jdk17u_pipeline_config.groovy @@ -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' ]