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.

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

feat(ISV-5130): add pipeline steps for SBOM upload #627

Open
wants to merge 1 commit into
base: development
Choose a base branch
from

Conversation

jedinym
Copy link
Contributor

@jedinym jedinym commented Oct 21, 2024

This PR extends the rh-advisories pipeline to create and upload product-level SBOMs.
Product-level SBOMs have been tested in Konflux with the help of @.scoheb.

A new tekton Task (collect-atlas-params) is added to generate Atlas parameters from the Atlas field RPAs. If no Atlas-related data is provided in the RPA, the SBOM processing is skipped.

Copy link

openshift-ci bot commented Oct 21, 2024

Hi @jedinym. Thanks for your PR.

I'm waiting for a konflux-ci member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@jedinym jedinym force-pushed the ISV-5130 branch 2 times, most recently from e03c642 to 96b9878 Compare October 21, 2024 07:22
@jedinym jedinym changed the title WIP: Add pipeline steps for SBOM upload wip(ISV-5130): Add pipeline steps for SBOM upload Oct 21, 2024
@jedinym jedinym changed the title wip(ISV-5130): Add pipeline steps for SBOM upload feat(ISV-5130): Add pipeline steps for SBOM upload Nov 12, 2024
@jedinym jedinym changed the title feat(ISV-5130): Add pipeline steps for SBOM upload feat(ISV-5130): add pipeline steps for SBOM upload Nov 12, 2024
@jedinym jedinym marked this pull request as ready for review November 12, 2024 10:24
@jedinym jedinym requested a review from a team as a code owner November 12, 2024 10:24
@jedinym
Copy link
Contributor Author

jedinym commented Nov 18, 2024

@mmalina In the latest commit, I made the SBOM processing optional when the Atlas fields are not provided in the RPA.

@mmalina
Copy link
Contributor

mmalina commented Nov 18, 2024

@mmalina In the latest commit, I made the SBOM processing optional when the Atlas fields are not provided in the RPA.

Let's continue in this thread: #627 (comment)

tasks/collect-atlas-params/README.md Outdated Show resolved Hide resolved
pipelines/rh-advisories/rh-advisories.yaml Outdated Show resolved Hide resolved
pipelines/rh-advisories/README.md Outdated Show resolved Hide resolved
tasks/create-product-sbom/create-product-sbom.yaml Outdated Show resolved Hide resolved
tasks/upload-sbom-to-atlas/README.md Outdated Show resolved Hide resolved
tasks/upload-sbom-to-atlas/upload-sbom-to-atlas.yaml Outdated Show resolved Hide resolved
Copy link

openshift-ci bot commented Nov 26, 2024

New changes are detected. LGTM label has been removed.

@mmalina
Copy link
Contributor

mmalina commented Nov 26, 2024

@jedinym it looks good. One last thing - can you improve the commit message? Now it just includes an ugly list of all the commits from the squash. It would be nice to have some summary of what's included in this.

@jedinym jedinym force-pushed the ISV-5130 branch 2 times, most recently from 683e232 to 2ee5465 Compare November 26, 2024 14:04
@johnbieren
Copy link
Collaborator

/ok-to-test

@jinqi7
Copy link
Collaborator

jinqi7 commented Nov 27, 2024

/retest

@jedinym
Copy link
Contributor Author

jedinym commented Nov 27, 2024

Hmm, the tests failed in a different way than in the e2e repo. Are they using the same vault for secrets? Could you please rerun them? @johnbieren @mmalina

@mmalina
Copy link
Contributor

mmalina commented Nov 27, 2024

Are they using the same vault for secrets?

The secrets are deployed to the clusters manually (if we're talking about the tests that run on staging Konflux cluster - not sure about the ones that run on the provisioned clusters), so you would need to ask Scott. But I don't see a reason why he would deploy something else here.

@mmalina
Copy link
Contributor

mmalina commented Nov 27, 2024

/retest

@jedinym
Copy link
Contributor Author

jedinym commented Nov 27, 2024

@mmalina I was thinking of the secrets used in the e2e test setup, not the ones used in the pipeline. I added those to the QE vault and it worked in the e2e repo. Here though, the test logs suggest that the new secrets were not found (somehow).

@mmalina
Copy link
Contributor

mmalina commented Nov 27, 2024

AFAIK, there is nothing different in the way e2e runs in this repo and in the e2e repo.

not the ones used in the pipeline

e2e runs the pipeline, so the secrets always need to be there in that environment. As you said, for the provisioned clusters, the qa vault is used. But some of our tests use staging Konflux, so for those, the secrets need to be set up manually. @jinqi7 am I right?

@jinqi7
Copy link
Collaborator

jinqi7 commented Nov 27, 2024

AFAIK, there is nothing different in the way e2e runs in this repo and in the e2e repo.

not the ones used in the pipeline

e2e runs the pipeline, so the secrets always need to be there in that environment. As you said, for the provisioned clusters, the qa vault is used. But some of our tests use staging Konflux, so for those, the secrets need to be set up manually. @jinqi7 am I right?

There is some difference. Please see the bug. Before it's fixed, we need to merge the PR in e2e-tests first.

@jedinym
Copy link
Contributor Author

jedinym commented Dec 2, 2024

@mmalina The e2e PR is merged, could you please rerun the tests?

@mmalina
Copy link
Contributor

mmalina commented Dec 2, 2024

/retest

@johnbieren
Copy link
Collaborator

/retest

@johnbieren
Copy link
Collaborator

/ok-to-test

@mmalina
Copy link
Contributor

mmalina commented Dec 3, 2024

/retest

@johnbieren
Copy link
Collaborator

/ok-to-test

The rh-advisories pipeline now supports generating product-level SBOMs
at release time and enhancing component-level SBOMs created at build
time with additional release-time data.

Signed-off-by: Martin Jediny <jedinym@proton.me>
@johnbieren
Copy link
Collaborator

/ok-to-test

@konflux-ci-qe-bot
Copy link

@jedinym: The following test has Failed, say /retest to rerun failed tests.

PipelineRun Name Status Rerun command Build Log Test Log
konflux-e2e-tests-catalog-tfsdw Failed /retest View Pipeline Log View Test Logs

Inspecting Test Artifacts

To inspect your test artifacts, follow these steps:

  1. Install ORAS (see the ORAS installation guide).
  2. Download artifacts with the following commands:
mkdir -p oras-artifacts
cd oras-artifacts
oras pull quay.io/konflux-test-storage/konflux-team/release-service-catalog:konflux-e2e-tests-catalog-tfsdw

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants