Add checksums to mock data #3683

bcl · 2023-09-13T02:08:49Z

This pull request includes:

adequate testing for the new functionality or fixed issue
adequate documentation informing people about the change such as
- submit a PR for the guides repository if this PR changed any behavior described there: https://www.osbuild.org/guides/

images master branch is more strict about the packages including a real looking checksum, so add them to the necessary tests.
This does not include a rebase of the vendored images, just a change to dnfjson.go to keep the tests passing.

bcl · 2023-09-13T22:01:01Z

This needs a new images vendored once PR #159 (with last commit from PR #160) is merged.

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD 0b7a6d7 with the main merge-base 360df12). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5101356988/artifacts/browse

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD 0b7a6d7 with the main merge-base 360df12). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5101357511/artifacts/browse

achilleas-k

Nice work. Thanks!!

achilleas-k · 2023-09-19T09:29:49Z

Rebased and re-approved.

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD 5d550aa with the main merge-base 44e6278). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5118541709/artifacts/browse

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD 5d550aa with the main merge-base 44e6278). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5119466617/artifacts/browse

henrywang · 2023-09-19T13:17:52Z

Tests / edge-simplified-9 failure has been fixed by PR #3690. It's can be ignored in this case or make a rebase.

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD d2d3677 with the main merge-base 7259dee). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5121877330/artifacts/browse

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD d2d3677 with the main merge-base 7259dee). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5122482820/artifacts/browse

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD 0df6554 with the main merge-base 3287290). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5128707754/artifacts/browse

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD 0df6554 with the main merge-base 3287290). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5128708151/artifacts/browse

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD 0df6554 with the main merge-base 3287290). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5128726822/artifacts/browse

Commit 312d87c6d5fab7ffd085a303e27b8db41111c86e adds validation of the checksums to the ImageType.Manifest call, so it requires a valid looking checksum, otherwise it will fail with a 'ManifestCreationFailed' error when running the unit tests.

and move the ResolveContent function from the images test_distro package. api_test is the only place using it, so it belongs there, not in images.

These use 'pkg1' when depsolving, so they need an entry in the manifest with the mocked checksum: sha256:e50ddb78a37f5851d1a5c37a4c77d59123153c156e628e064b9daa378f45a2fe

This is needed for the test_distro.NewTestDistro change.

Fix all instances of gosec G601: Implicit memory aliasing in for loop.

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD 2b8ac0f with the main merge-base 3a9bcde). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5137150505/artifacts/browse

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD 2b8ac0f with the main merge-base 3a9bcde). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5137150909/artifacts/browse

schutzbot

⚠️ This PR introduces changes in at least one manifest (when comparing PR HEAD 2b8ac0f with the main merge-base 3a9bcde). Please review the changes. The changes can be found in the artifacts of the Manifest-diff job [0] as manifests.diff.

[0] https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/jobs/5138314125/artifacts/browse

achilleas-k mentioned this pull request Sep 13, 2023

Test distro and mock dnf json cleanup osbuild/images#159

Merged

bcl force-pushed the main-add-test-checksums branch from 6b9aa40 to 5cff870 Compare September 13, 2023 21:55

bcl force-pushed the main-add-test-checksums branch 2 times, most recently from dc6f9fc to 0b7a6d7 Compare September 15, 2023 16:38

bcl mentioned this pull request Sep 15, 2023

lint: Fix implicit memory aliasing in for loops #3687

Closed

3 tasks

schutzbot reviewed Sep 15, 2023

View reviewed changes

achilleas-k approved these changes Sep 18, 2023

View reviewed changes

achilleas-k force-pushed the main-add-test-checksums branch from 0b7a6d7 to 5d550aa Compare September 19, 2023 09:29

achilleas-k approved these changes Sep 19, 2023

View reviewed changes

schutzbot reviewed Sep 19, 2023

View reviewed changes

bcl force-pushed the main-add-test-checksums branch from 5d550aa to d2d3677 Compare September 19, 2023 15:29

schutzbot reviewed Sep 19, 2023

View reviewed changes

achilleas-k force-pushed the main-add-test-checksums branch from d2d3677 to 0df6554 Compare September 20, 2023 11:37

achilleas-k enabled auto-merge (rebase) September 20, 2023 11:37

schutzbot reviewed Sep 20, 2023

View reviewed changes

bcl added 7 commits September 21, 2023 12:45

api_test: Log the path being tested in TestModulesInfo

d7231af

test: Use test_distro.NewTestDistro from images

618862a

and move the ResolveContent function from the images test_distro package. api_test is the only place using it, so it belongs there, not in images.

cloudapi: Catch and log Serialize errors

ca8b747

test: Add checksum to cloudapi tests

03c89eb

These use 'pkg1' when depsolving, so they need an entry in the manifest with the mocked checksum: sha256:e50ddb78a37f5851d1a5c37a4c77d59123153c156e628e064b9daa378f45a2fe

vendor: Update osbuild/images to commit dd48a38be218

4d09945

This is needed for the test_distro.NewTestDistro change.

lint: Fix implicit memory aliasing in for loops

2b8ac0f

Fix all instances of gosec G601: Implicit memory aliasing in for loop.

thozza force-pushed the main-add-test-checksums branch from 0df6554 to 2b8ac0f Compare September 21, 2023 10:45

schutzbot reviewed Sep 21, 2023

View reviewed changes

achilleas-k merged commit 9e39080 into osbuild:main Sep 21, 2023
47 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add checksums to mock data #3683

Add checksums to mock data #3683

bcl commented Sep 13, 2023

bcl commented Sep 13, 2023

schutzbot left a comment

schutzbot left a comment

achilleas-k left a comment

achilleas-k commented Sep 19, 2023

schutzbot left a comment

schutzbot left a comment

henrywang commented Sep 19, 2023 •

edited

Loading

schutzbot left a comment

schutzbot left a comment

schutzbot left a comment

schutzbot left a comment

schutzbot left a comment

schutzbot left a comment

schutzbot left a comment

schutzbot left a comment

Add checksums to mock data #3683

Add checksums to mock data #3683

Conversation

bcl commented Sep 13, 2023

bcl commented Sep 13, 2023

schutzbot left a comment

Choose a reason for hiding this comment

schutzbot left a comment

Choose a reason for hiding this comment

achilleas-k left a comment

Choose a reason for hiding this comment

achilleas-k commented Sep 19, 2023

schutzbot left a comment

Choose a reason for hiding this comment

schutzbot left a comment

Choose a reason for hiding this comment

henrywang commented Sep 19, 2023 • edited Loading

schutzbot left a comment

Choose a reason for hiding this comment

schutzbot left a comment

Choose a reason for hiding this comment

schutzbot left a comment

Choose a reason for hiding this comment

schutzbot left a comment

Choose a reason for hiding this comment

schutzbot left a comment

Choose a reason for hiding this comment

schutzbot left a comment

Choose a reason for hiding this comment

schutzbot left a comment

Choose a reason for hiding this comment

schutzbot left a comment

Choose a reason for hiding this comment

henrywang commented Sep 19, 2023 •

edited

Loading