Merge sbom manipulation steps #1291
Conversation
|
Here is the associated PR konflux-ci/build-tasks-dockerfiles#154 |
|
/retest |
| #!/bin/python3 | ||
| import json | ||
| echo "Merging contents of sbom-source.json and sbom-image.json into sbom-cyclonedx.json" | ||
| python3 /scripts/merge_syft_sboms.py |
There was a problem hiding this comment.
As the next improvement, we should make these scripts accept params for the sbom paths, similar to the merge_cachi2_sboms.py and base_images_sbom_script.py scripts.
In the current state, the scripts that don't take params just look like magic :D
There was a problem hiding this comment.
I agree, let's do that as a next improvement (not part of this round of PRs)
mkosiarc
force-pushed
the
merge-steps
branch
2 times, most recently
from
c523116
to
feedf32
Compare
The steps merge-syft-sboms, merge-cachi2-sbom, create-purl-sbom, create-base-images-sbom were merged into single "prepare-sboms" step. This is done because the tekton results size for a task depends on the number of steps. By reducing the number of the steps we increase the limit. The scripts from the individual steps were moved to the build-tasks-dockerfiles repo that also contains the Dockerfile for the sbom-utility-scripts image. STONEBLD-2608 Signed-off-by: mkosiarc <[email protected]>
| - name: merge-syft-sboms | ||
| image: registry.access.redhat.com/ubi9/python-39:1-192.1722518946@sha256:0176b477075984d5a502253f951d2502f0763c551275f9585ac515b9f241d73d | ||
| - name: prepare-sboms | ||
| image: quay.io/redhat-appstudio/sbom-utility-scripts-image@sha256:064eeec1cfb75abd21b533bf0d9870a7a3fb138f30192596dce28061798cbf06 |
There was a problem hiding this comment.
I'm not sure we need -image suffix in the mage name.
There was a problem hiding this comment.
We don't, but not sure if it is worth it renaming it now. I would have to create a new repo in quay, create additional PR in build-task-dockerfiles and update it in this one as well.
The steps merge-syft-sboms, merge-cachi2-sbom, create-purl-sbom, create-base-images-sbom were merged into single "prepare-sboms" step. This is done because the tekton results size for a task depends on the number of steps. By reducing the number of the steps we increase the limit.
The scripts from the individual steps were moved to the build-tasks-dockerfiles repo that also contains the Dockerfile for the sbom-utility-scripts image.
STONEBLD-2608