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

Exclude images not enabled in Konflux from the scan report #1176

Conversation

locriandev
Copy link
Contributor

scan-sources for Konflux is already not scanning for changes in images that are not enabled in the konflux config stanza.
Nonetheless, if a parent image of a disabled one is changing, doozer propagates the child into the report and marks it for rebuild.

To prevent this, perform an extra filtering right before generating the output report, which serves as input to the ocp4-scan-konflux pipeline and to ocp4-konflux.

Copy link
Contributor

openshift-ci bot commented Dec 4, 2024

@locriandev: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/security 50e347b link false /test security

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@@ -640,9 +640,21 @@ def add_image_meta_change(self, meta: ImageMetadata, rebuild_hint: RebuildHint):
self.add_assessment_reason(descendant_meta, RebuildHint(RebuildHintCode.ANCESTOR_CHANGING,
f'Ancestor {meta.distgit_key} is changing'))

def is_image_enabled(self, image_name: str) -> bool:
image_meta = self.runtime.image_map[image_name]
Copy link
Contributor

Choose a reason for hiding this comment

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

Would like to add a check to return False if the image_name is not in image_map.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think that could happen, as image_map in the runtime is constructed from the image metas which we iterate through during the scan

@@ -640,9 +640,21 @@ def add_image_meta_change(self, meta: ImageMetadata, rebuild_hint: RebuildHint):
self.add_assessment_reason(descendant_meta, RebuildHint(RebuildHintCode.ANCESTOR_CHANGING,
f'Ancestor {meta.distgit_key} is changing'))

def is_image_enabled(self, image_name: str) -> bool:
image_meta = self.runtime.image_map[image_name]
Copy link
Contributor

Choose a reason for hiding this comment

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

Would like to add a check to return False if the image_name is not in image_map.

@@ -640,9 +640,21 @@ def add_image_meta_change(self, meta: ImageMetadata, rebuild_hint: RebuildHint):
self.add_assessment_reason(descendant_meta, RebuildHint(RebuildHintCode.ANCESTOR_CHANGING,
f'Ancestor {meta.distgit_key} is changing'))

def is_image_enabled(self, image_name: str) -> bool:
image_meta = self.runtime.image_map[image_name]
Copy link
Contributor

Choose a reason for hiding this comment

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

Would like to add a check to return False if the image_name is not in image_map.

@locriandev locriandev requested a review from vfreex December 4, 2024 13:49
Copy link
Contributor

@vfreex vfreex left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 5, 2024
Copy link
Contributor

openshift-ci bot commented Dec 5, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vfreex

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 5, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit a8349c3 into openshift-eng:main Dec 5, 2024
2 of 3 checks passed
@locriandev locriandev deleted the exclude-disabled-images-from-scan-report branch December 5, 2024 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants