OCPBUGS-11371: fix: skips bundles with 'skips' field on head bundle

[aguidirh]

Description

When adding dependencies, the bundles in skips field of the head should not be considered as a valid bundles since they are not part of the upgradeGraph.

Fixes OCPBUGS-11371

Type of change

Please delete options that are not relevant.

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

How Has This Been Tested?

ImageSetConfig

apiVersion: mirror.openshift.io/v1alpha2
kind: ImageSetConfiguration
mirror:
  operators:
    - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.12

command:

./bin/oc-mirror -c /home/aguidi/go/src/github.com/aguidirh/oc-mirror/ocpbugs-11371.yaml --continue-on-error file://ocpbugs11371

Test Configuration:

• Firmware version:
• Hardware:
• Toolchain:
• SDK:

Checklist:

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• Any dependent changes have been merged and published in downstream modules

[openshift-ci-robot]

@aguidirh: This pull request references Jira Issue OCPBUGS-11371, which is invalid:

• expected the bug to target the "4.14.0" version, but it targets "4.13.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Description

When adding dependencies the bundles in skips, replaces or skipRange fields should not be considered as a valid bundle.

Fixes OCPBUGS-11371

Type of change

Please delete options that are not relevant.

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

How Has This Been Tested?

ImageSetConfig

apiVersion: mirror.openshift.io/v1alpha2
kind: ImageSetConfiguration
mirror:
 operators:
   - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.12

command:

./bin/oc-mirror -c /home/aguidi/go/src/github.com/aguidirh/oc-mirror/ocpbugs-11371.yaml --continue-on-error file://ocpbugs11371

Test Configuration:

• Firmware version:
• Hardware:
• Toolchain:
• SDK:

Checklist:

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• Any dependent changes have been merged and published in downstream modules

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/test-infra repository.

[openshift-ci-robot]

@aguidirh: This pull request references Jira Issue OCPBUGS-11371, which is invalid:

• expected the bug to target the "4.14.0" version, but it targets "4.13.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Description

When adding dependencies, the bundles in skips field of the head should not be considered as a valid bundles since they are not part of the upgradeGraph.

Fixes OCPBUGS-11371

Type of change

Please delete options that are not relevant.

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

How Has This Been Tested?

ImageSetConfig

apiVersion: mirror.openshift.io/v1alpha2
kind: ImageSetConfiguration
mirror:
 operators:
   - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.12

command:

./bin/oc-mirror -c /home/aguidi/go/src/github.com/aguidirh/oc-mirror/ocpbugs-11371.yaml --continue-on-error file://ocpbugs11371

Test Configuration:

• Firmware version:
• Hardware:
• Toolchain:
• SDK:

Checklist:

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• Any dependent changes have been merged and published in downstream modules

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/test-infra repository.

[aguidirh]

/jira refresh

[openshift-ci-robot]

@aguidirh: This pull request references Jira Issue OCPBUGS-11371, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.0) matches configured target version for branch (4.14.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @zhouying7780

In response to this:

/jira refresh

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/test-infra repository.

[lmzuccarelli]

@aguidirh - the implementation looks nice and simple.

Good work on the various test scenarios - comprehensive !!!

[lmzuccarelli]

/lgtm

[dinhxuanvu]

Overall, looks fine to me. Just some small nits. As we discussed offline, I would like to ask you to run some tests locally to ensure oc-mirror is still generating a proper and functional FBC with this change (compared to without this fix).

[aguidirh]

/assign @dinhxuanvu

[openshift-ci]

@aguidirh: all tests passed!

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

[dinhxuanvu]

/approve
/hold
Hold until Alex can do some local testing to ensure this change doesn't inadvertently break other operators.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aguidirh, dinhxuanvu

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:

• OWNERS [dinhxuanvu]

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

[zhouying7780]

pre merge test done , can't hit the block now.

[zhouying7780]

/label qe-approved

[sherine-k]

/lgtm

[aguidirh]

/unhold

[openshift-ci-robot]

@aguidirh: Jira Issue OCPBUGS-11371: All pull requests linked via external trackers have merged:

• openshift/oc-mirror#608

Jira Issue OCPBUGS-11371 has been moved to the MODIFIED state.

In response to this:

Description

When adding dependencies, the bundles in skips field of the head should not be considered as a valid bundles since they are not part of the upgradeGraph.

Fixes OCPBUGS-11371

Type of change

Please delete options that are not relevant.

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

How Has This Been Tested?

ImageSetConfig

apiVersion: mirror.openshift.io/v1alpha2
kind: ImageSetConfiguration
mirror:
 operators:
   - catalog: registry.redhat.io/redhat/redhat-operator-index:v4.12

command:

./bin/oc-mirror -c /home/aguidi/go/src/github.com/aguidirh/oc-mirror/ocpbugs-11371.yaml --continue-on-error file://ocpbugs11371

Test Configuration:

• Firmware version:
• Hardware:
• Toolchain:
• SDK:

Checklist:

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• Any dependent changes have been merged and published in downstream modules

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/test-infra repository.

[aguidirh]

/cherrypick release-4.13

[openshift-cherrypick-robot]

@aguidirh: new pull request created: #617

In response to this:

/cherrypick release-4.13

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/test-infra repository.

[aguidirh]

/cherrypick release-4.12

[openshift-cherrypick-robot]

@aguidirh: new pull request created: #618

In response to this:

/cherrypick release-4.12

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/test-infra repository.

[indor79]

Will this also be cherrypicked to 4.11 ?