Enable nightly build with reproducible comparison #714

sophia-guo · 2023-06-05T13:23:57Z

Signed-off-by: Sophia Guo sophia.gwf@gmail.com

github-actions · 2023-06-05T13:24:11Z

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 Guidelines

If you have not done so already, please familiarise yourself with our Contributing Guidelines and Code Of Conduct, even if you have contributed before.

Tests

Github 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 run tests on this PR.
If you are not an admin, please ask for one's attention in #infrastructure on Slack or ping one here.
To run full set of tests, use "run tests"; a subset of tests on specific jdk version, use "run tests quick 11,20"

sxa · 2023-06-05T14:00:41Z

Hi - I'd like to just understand the approach since there is no description associated with this PR.

Is this adding an extra step into every nightly build that will rebuild it in parallel with running the normal testing, and verify that it comes out identical? And this is only enabling it on Linux/x64. Is it using the output of the SBOM to perform the second build or just re-running with the same parameters from jenkins?

sophia-guo · 2023-06-05T15:29:06Z

Is this adding an extra step into every nightly build that will rebuild it in parallel with running the normal testing, and verify that it comes out identical? And this is only enabling it on Linux/x64. Is it using the output of the SBOM to perform the second build or just re-running with the same parameters from jenkins?

This is to add an extra step to trigger a **_reproduce_compare jenkins job, which will not block current pipeline job.
The **_reproduce_compare jenkins job will trigger a second build job with all same parameters as the current one except the parameters BUILD_REF, SCM_REF, BUILD_ARGS and ENABLE_TESTS. The parameters BUILD_REF, SCM_REF, BUILD_ARGS are set by the current one's SBOM data. The triggered build job output will be compared with the current build job output to see if there is difference.

I have created job https://ci.adoptium.net/job/jdk17u-linux-x64-temurin_reproduce_compare/ for testing, but need admins help to move it to folder build-scripts/jobs/jdk17u/. @sxa @andrew-m-leonard could you please help this?

sxa · 2023-06-05T16:32:30Z

Thanks for the explanation. Since this job isn't being auto-generated I would suggest that it may be preferable to keep it outside the normal jdk17u folder to ensure it doesn't get accidentally deleted at any point (someone might think that everything in there can be regenerated automatically).

pipelines/build/common/openjdk_build_pipeline.groovy

tools/reproduce_comparison/Jenkinsfile

pipelines/build/common/openjdk_build_pipeline.groovy

tools/reproduce_comparison/Jenkinsfile

tools/reproduce_comparison/JenkinsfileOld

sxa · 2023-06-06T11:57:30Z

@sophia-guo Can you avoid force pushing on every fix please since it makes it impossible to see what's changed since a reviewer last looked at the code.

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

sophia-guo · 2023-06-06T19:59:16Z

Did a rebase and some changes are accidentally gone.

Can you avoid force pushing on every fix please since it makes it impossible to see what's changed since a reviewer last looked at the code.

@sxa I think with force push the changes since last review can still be available
https://github.com/adoptium/ci-jenkins-pipelines/compare/73a87bb1a396b637c8bab08c5a852ac54abaac29..2be0fecab230acc143eade49bb0eb500c935d1ee

Resubmit the changes Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

andrew-m-leonard

just a couple of comments

tools/reproduce_comparison/Jenkinsfile

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

docs/UsingOurScripts.md

pipelines/build/common/build_base_file.groovy

pipelines/build/common/config_regeneration.groovy

pipelines/jobs/release_pipeline_job_template.groovy

tools/reproduce_comparison/Jenkinsfile

karianna · 2023-06-08T03:20:47Z

Some more linter and test fixes needed

sxa · 2023-06-08T09:32:29Z

Did a rebase and some changes are accidentally gone.

Can you avoid force pushing on every fix please since it makes it impossible to see what's changed since a reviewer last looked at the code.

@sxa I think with force push the changes since last review can still be available https://github.com/adoptium/ci-jenkins-pipelines/compare/73a87bb1a396b637c8bab08c5a852ac54abaac29..2be0fecab230acc143eade49bb0eb500c935d1ee

Yes you can get to it but it's a bit more difficult to find them, especially if there have been multiple force pushes.

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

sxa · 2023-06-08T17:25:29Z

docs/UsingOurScripts.md

@@ -79,7 +79,7 @@ This file contains the default constants and paths used in the build scripts for
    // Test suite and inclusion details
    "testDetails"            : {
        // Boolean denoting wether the reproducible compare is needed


Suggested change

// Boolean denoting wether the reproducible compare is needed

// Boolean denoting whether the reproducible compare is needed

sophia-guo · 2023-06-08T17:58:19Z

Note the test failed at https://github.com/adoptium/ci-jenkins-pipelines/pull/714/files#diff-fc15f6bbd3ef3cf595558447270454056407397071c7efbd13ca516fcf0a3a5bR66. Test is using master default.json, which has not been updated with this PR

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

sophia-guo · 2023-06-10T00:07:39Z

Depends adoptium/temurin-build#3386

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

andrew-m-leonard

nice work @sophia-guo

pipelines/src/test/groovy/RepoHandlerTest.groovy

andrew-m-leonard

Just an update to https://raw.githubusercontent.com/adoptium/ci-jenkins-pipelines/master/pipelines/defaults.json required

Is correct

andrew-m-leonard

lgtm

andrew-m-leonard · 2023-06-12T14:53:29Z

Just an update to https://raw.githubusercontent.com/adoptium/ci-jenkins-pipelines/master/pipelines/defaults.json required

Has been updated...

sxa · 2023-06-12T16:15:34Z

Is the failing Groovy check a concern here?

sophia-guo · 2023-06-12T17:02:18Z

Is the failing Groovy check a concern here?

Shouldn't. See
#714 (comment)

* Add detail error messages Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> * Enable nightly reproducible comparison Resubmit the changes Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> * Correct lint error Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> * Add enableReproducibleCompare flag Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> * Set reproducible job ENABLE_REPRODUCIBLE_COMPARE false Avoid recursive build Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> * Update build timestamp Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> * Format update Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> * Update test case Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> * Remove unnecessary file permission step Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> * Typo Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> * Fix isRelease and params correctly Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> * Limit json file to SBOM specific and remove unnecessary code Signed-off-by: Sophia Guo <sophia.gwf@gmail.com> --------- Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

sophia-guo requested a review from andrew-m-leonard June 5, 2023 13:24

github-actions bot added the jenkins-pipeline label Jun 5, 2023

sophia-guo self-assigned this Jun 5, 2023

sophia-guo force-pushed the reprod branch 4 times, most recently from 3224ffa to 679cfd9 Compare June 5, 2023 15:09

sophia-guo force-pushed the reprod branch from 679cfd9 to e2b1c01 Compare June 5, 2023 15:31

sxa reviewed Jun 5, 2023

View reviewed changes

pipelines/build/common/openjdk_build_pipeline.groovy Outdated Show resolved Hide resolved

sophia-guo force-pushed the reprod branch 3 times, most recently from bd01565 to 73a87bb Compare June 5, 2023 18:18

karianna requested changes Jun 6, 2023

View reviewed changes

sophia-guo force-pushed the reprod branch from 73a87bb to 2be0fec Compare June 6, 2023 03:23

Add detail error messages

7af3295

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

sophia-guo force-pushed the reprod branch from 7cd0920 to 7af3295 Compare June 6, 2023 19:34

github-actions bot added jenkins-pipeline and removed jenkins-pipeline labels Jun 6, 2023

sophia-guo added 2 commits June 6, 2023 16:11

Enable nightly reproducible comparison

ad2c904

Resubmit the changes Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

Correct lint error

f496dc4

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

andrew-m-leonard reviewed Jun 7, 2023

View reviewed changes

tools/reproduce_comparison/Jenkinsfile Outdated Show resolved Hide resolved

tools/reproduce_comparison/Jenkinsfile Outdated Show resolved Hide resolved

sophia-guo mentioned this pull request Jun 7, 2023

Add ENABLE_REPRODUCIBLE_COMPARE flag adoptium/jenkins-helper#56

Merged

github-actions bot added documentation generation Issues that provide enhancements or fixes to the job generators labels Jun 7, 2023

Update build timestamp

87b4529

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

karianna approved these changes Jun 8, 2023

View reviewed changes

sophia-guo added 3 commits June 8, 2023 11:56

Format update

afd791a

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

Update test case

95a4529

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

Remove unnecessary file permission step

685f068

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

sxa reviewed Jun 8, 2023

View reviewed changes

Typo

a3c6404

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

Fix isRelease and params correctly

3efb4de

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

sophia-guo force-pushed the reprod branch 2 times, most recently from 10fdd38 to cf01432 Compare June 12, 2023 13:36

Limit json file to SBOM specific and remove unnecessary code

094fc43

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>

sophia-guo force-pushed the reprod branch from cf01432 to 094fc43 Compare June 12, 2023 14:00

andrew-m-leonard approved these changes Jun 12, 2023

View reviewed changes

andrew-m-leonard reviewed Jun 12, 2023

View reviewed changes

pipelines/src/test/groovy/RepoHandlerTest.groovy Show resolved Hide resolved

andrew-m-leonard previously requested changes Jun 12, 2023

View reviewed changes

andrew-m-leonard approved these changes Jun 12, 2023

View reviewed changes

sophia-guo merged commit 96e14e1 into adoptium:master Jun 12, 2023
6 of 7 checks passed

This was referenced Jun 12, 2023

Fix reproducible parameters #722

Merged

pipeline_jobs_generator_jdk17u job failed #723

Closed

andrew-m-leonard mentioned this pull request Jun 14, 2023

Feature: add 2nd build in nightly build so we can compare if 1st and 2nd are the same outcome #504

Closed

sophia-guo mentioned this pull request Jun 14, 2023

reproduce_compare build failed with 'java.nio.file.NoSuchFileException' #730

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enable nightly build with reproducible comparison #714

Enable nightly build with reproducible comparison #714

sophia-guo commented Jun 5, 2023 •

edited

github-actions bot commented Jun 5, 2023

sxa commented Jun 5, 2023

sophia-guo commented Jun 5, 2023

sxa commented Jun 5, 2023 •

edited

sxa commented Jun 6, 2023

sophia-guo commented Jun 6, 2023

andrew-m-leonard left a comment

karianna commented Jun 8, 2023

sxa commented Jun 8, 2023

sxa Jun 8, 2023

sophia-guo commented Jun 8, 2023

sophia-guo commented Jun 10, 2023

andrew-m-leonard left a comment

andrew-m-leonard left a comment

andrew-m-leonard left a comment

andrew-m-leonard commented Jun 12, 2023

sxa commented Jun 12, 2023

sophia-guo commented Jun 12, 2023 •

edited

	// Boolean denoting wether the reproducible compare is needed
	// Boolean denoting whether the reproducible compare is needed

Enable nightly build with reproducible comparison #714

Enable nightly build with reproducible comparison #714

Conversation

sophia-guo commented Jun 5, 2023 • edited

github-actions bot commented Jun 5, 2023

Thank you for creating a pull request!

Code Quality and Contributing Guidelines

Tests

sxa commented Jun 5, 2023

sophia-guo commented Jun 5, 2023

sxa commented Jun 5, 2023 • edited

sxa commented Jun 6, 2023

sophia-guo commented Jun 6, 2023

andrew-m-leonard left a comment

Choose a reason for hiding this comment

karianna commented Jun 8, 2023

sxa commented Jun 8, 2023

sxa Jun 8, 2023

Choose a reason for hiding this comment

sophia-guo commented Jun 8, 2023

sophia-guo commented Jun 10, 2023

andrew-m-leonard left a comment

Choose a reason for hiding this comment

andrew-m-leonard left a comment

Choose a reason for hiding this comment

andrew-m-leonard left a comment

Choose a reason for hiding this comment

andrew-m-leonard commented Jun 12, 2023

sxa commented Jun 12, 2023

sophia-guo commented Jun 12, 2023 • edited

sophia-guo commented Jun 5, 2023 •

edited

sxa commented Jun 5, 2023 •

edited

sophia-guo commented Jun 12, 2023 •

edited