Disable reproducible comparison for pr-tester and release per platform #731
Conversation
Thank you for creating a pull request!Please check out the information below if you have not made a pull request here before (or if you need a reminder how things work). Code Quality and Contributing GuidelinesIf you have not done so already, please familiarise yourself with our Contributing Guidelines and Code Of Conduct, even if you have contributed before. TestsGithub actions will run a set of jobs against your PR that will lint and unit test your changes. Keep an eye out for the results from these on the latest commit you submitted. For more information, please see our testing documentation. In order to run the advanced pipeline tests (executing a set of mock pipelines), it requires an admin to post |
| if ( env.JOB_NAME.contains('pr-tester') || env.JOB_NAME.contains('release')) { | ||
| enableReproducibleCompare = false | ||
| } else { |
There was a problem hiding this comment.
personally speaking, I feel this logic should be added when the job is generated not the build is called. e.g in getReproducibleCompare
There was a problem hiding this comment.
Configurations in https://github.com/adoptium/ci-jenkins-pipelines/blob/b7e00a70ab650a485c47120deab22cbc001e9ad4/pipelines/build/common/config_regeneration.groovy are used as a placeholder it could be overwritten during the build time.
| @@ -4,7 +4,7 @@ Jenkins job does reproducible build compare. | |||
| import groovy.json.JsonOutput | |||
|
|
|||
| pipeline { | |||
| agent any | |||
| agent { label 'dockerBuild&&linux&&x64' } | |||
There was a problem hiding this comment.
fine with this, but if mac and windows logic are enabled later, we need find a better label combination or even move agent setting into later stage .
There was a problem hiding this comment.
Not sure for other platform if different agent is required. The job is to trigger another build job and do the comparison. All comparison is done by shell script feels like linux agent is enough with tar installed.
| @@ -59,7 +59,7 @@ pipeline { | |||
| jsonJobParams.BUILD_CONFIGURATION.SCM_REF = scmRef | |||
| jsonJobParams.BUILD_CONFIGURATION.BUILD_REF = buildRef | |||
| jsonJobParams.BUILD_CONFIGURATION.BUILD_ARGS += " --build-reproducible-date ${buildTimeStamp}" | |||
| jsonJobParams.BUILD_CONFIGURATION.ENABLE_REPRODUCIBLE_COMPARE = "false" | |||
| jsonJobParams.BUILD_CONFIGURATION.ENABLE_REPRODUCIBLE_COMPARE = false | |||
There was a problem hiding this comment.
think the reason with "" is to treat it as String, since textParam only support String. Can test and see if it work here
There was a problem hiding this comment.
ENABLE_REPRODUCIBLE_COMPARE is defined as Boolean https://github.com/adoptium/jenkins-helper/blob/master/src/common/IndividualBuildConfig.groovy#L55
Signed-off-by: Sophia Guo <[email protected]>
github-actions
bot
added
generation
sophia-guo
changed the title
…m#731) Signed-off-by: Sophia Guo <[email protected]>
Setting ENABLE_REPRODUCIBLE_COMPARE as boolean
Other updates: JDKs path, dir, label
Related adoptium/temurin-build#3245
Signed-off-by: Sophia Guo [email protected]