Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

oci-copy: rework SBOM generation, support SPDX #1816

Merged
merged 2 commits into from
Jan 28, 2025
Merged

oci-copy: rework SBOM generation, support SPDX #1816

merged 2 commits into from
Jan 28, 2025

Conversation

chmeliik
Copy link
Contributor

@chmeliik chmeliik mentioned this pull request Jan 14, 2025
Closed
@chmeliik
Copy link
Contributor Author

Uses my build of the sbom-utility-image for now. konflux-ci/build-tasks-dockerfiles#226 will need to be merged first.

@ralphbean would you be able to test this?

@chmeliik chmeliik mentioned this pull request Jan 23, 2025
Open
@chmeliik chmeliik marked this pull request as ready for review January 23, 2025 13:49
@chmeliik chmeliik requested a review from ralphbean as a code owner January 23, 2025 13:49
chmeliik
chmeliik commented Jan 23, 2025
View reviewed changes
Copy link
Contributor Author

@chmeliik chmeliik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested in ralphbean/merlinite-poc#17

task/oci-copy/0.1/oci-copy.yaml Outdated Show resolved Hide resolved
@chmeliik chmeliik mentioned this pull request Jan 23, 2025
Merged
ralphbean
ralphbean previously approved these changes Jan 24, 2025
View reviewed changes
Copy link
Member

@ralphbean ralphbean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, apart from the stray image: references.

@chmeliik
oci-copy: rework SBOM generation
a867b8e 
Use scripts from https://github.com/konflux-ci/build-tasks-dockerfiles
instead of the previous bash script.

Signed-off-by: Adam Cmiel <[email protected]>
@chmeliik
oci-copy: support SPDX
9f2b33b 
Add SBOM_TYPE param to allow choosing the SBOM format to generate.
Defaults to cyclonedx for now.

Signed-off-by: Adam Cmiel <[email protected]>
@chmeliik
Copy link
Contributor Author

Rebased on main, updated to released sbom-utility-scripts image

@chmeliik
Copy link
Contributor Author

Re-tested in ralphbean/merlinite-poc#17, still works

@chmeliik
Copy link
Contributor Author

/retest

2 similar comments
@chmeliik
Copy link
Contributor Author

/retest

@chmeliik
Copy link
Contributor Author

/retest

@chmeliik
Copy link
Contributor Author

Failing on the EC pipeline

The PipelineRun ec-integration-test-scenario-run-6gmmr in namespace build-templates-e2e has status.conditions ...

Which has happened at least twice now, but I was too late to see the logs and Tekton Results doesn't have the PipelineRun either 😞

@chmeliik
Copy link
Contributor Author

/retest

@chmeliik
Copy link
Contributor Author

e2e-tests seem to be failing on this check, somehow https://github.com/konflux-ci/e2e-tests/blob/a0231e68fa09297514a239bbeb287a3e7d3811f8/tests/build/build_templates.go#L664.

I'm fairly certain that's unrelated to the changes here, the oci-copy task doesn't have e2e tests anyway.

@mmorhun mmorhun merged commit c516e12 into konflux-ci:main Jan 28, 2025
15 of 16 checks passed
@chmeliik chmeliik deleted the oci-copy-spdx branch January 28, 2025 09:34
@chmeliik
Copy link
Contributor Author

Force-merging to avoid e2e-tests blocking the SPDX progress

@rh-tap-build-team rh-tap-build-team bot mentioned this pull request Jan 28, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ralphbean ralphbean ralphbean left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@chmeliik @ralphbean @mmorhun