OCPBUGS-31536: Change default behavior to not rebuild catalogs for V1 - 2

[sherine-k]

Description

This PR fixes a regression introduced by PR #844.
Mirroring M2M and M2D for registry based catalogs was failing with error :

oc adm catalog mirror [file://rhceph-dev/ocs-registry:4.16.0-92](file:///ocs-registry:4.16.0-92) REGISTRY/REPOSITORY
error: lstat /home/jenkins/quay.io: no such file or directory

Fixes OCPBUGS-31536

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?

Using the following imageSetConfig:

apiVersion: mirror.openshift.io/v1alpha2
mirror:
  operators:
  - catalog: quay.io/skhoury/oc-mirror-dev:test-catalog-latest
    packages: 
    - name: foo
  
  - catalog: oci:///home/skhoury/testcatalog
    # targetCatalog: oc-mirror-dev:oci
    packages: 
    - name: bar

Test matrix

Test	workflow	catalog type	rebuildCatalogs	use OPM_BINARY	result
1	MirrorToMirror	registry based	no	NA	OK
2	MirrorToMirror	OCI file based	no	NA	OK
3	MirrorToMirror	registry based	yes	no	OK
4	MirrorToMirror	OCI file based	yes	no	not tested
5	MirrorToMirror	registry based	yes	yes	OK
6	MirrorToMirror	OCI file based	yes	yes	OK
7	MirrorToDisk	registry based	NA	NA	OK
8	MirrorToDisk	OCI file based	NA	NA	OK
9	DiskToMirror	registry based	no	NA	OK
10	DiskToMirror	OCI file based	no	NA	OK
11	DiskToMirror	registry based	yes	no	not tested
12	DiskToMirror	OCI file based	yes	no	not tested
13	DiskToMirror	registry based	yes	yes	OK
14	DiskToMirror	OCI file based	yes	yes	OK

Expected Outcome

The mirroring completes without errors, and the catalog is available on the mirror registry.
Not tested:

• For catalogs mirrored without --rebuild-catalogs
  • The catalogsource should be deployable on the cluster, regardless of the catalog version (v4.15 or v4.14, etc)
  • oc-mirror should work on rhel8 and rhel9 systems
• For catalogs mirrored with --rebuild-catalogs and OPM_BINARY defined
  • The catalogsource should be deployable on the cluster, regardless of the catalog version (v4.15 or v4.14, etc)
  • oc-mirror should work on rhel8 and rhel9 systems provided that the OPM_BINARY chosen corresponds to the os.

[openshift-ci-robot]

@sherine-k: This pull request references Jira Issue OCPBUGS-31536, 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.16.0) matches configured target version for branch (4.16.0)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @kasturinarra

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

In response to this:

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Fixes # (issue)

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?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

Expected Outcome

Please describe the outcome expected from the tests

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sherine-k

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 [sherine-k]

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

[openshift-ci-robot]

@sherine-k: This pull request references Jira Issue OCPBUGS-31536, which is valid.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @kasturinarra

In response to this:

Description

This PR fixes a regression introduced by PR #844.
Mirroring M2M and M2D for registry based catalogs was failing with error :

oc adm catalog mirror [file://rhceph-dev/ocs-registry:4.16.0-92](file:///ocs-registry:4.16.0-92) REGISTRY/REPOSITORY
error: lstat /home/jenkins/quay.io: no such file or directory

Fixes OCPBUGS-31536

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?

Using the following imageSetConfig:

apiVersion: mirror.openshift.io/v1alpha2
mirror:
 operators:
 - catalog: quay.io/skhoury/oc-mirror-dev:test-catalog-latest
   packages: 
   - name: foo
 
 - catalog: oci:///home/skhoury/testcatalog
   # targetCatalog: oc-mirror-dev:oci
   packages: 
   - name: bar

Test matrix

Test	workflow	catalog type	rebuildCatalogs	use OPM_BINARY	result
1	MirrorToMirror	registry based	no	NA	OK
2	MirrorToMirror	OCI file based	no	NA	OK
3	MirrorToMirror	registry based	yes	no	OK
4	MirrorToMirror	OCI file based	yes	no	not tested
5	MirrorToMirror	registry based	yes	yes	OK
6	MirrorToMirror	OCI file based	yes	yes	OK
7	MirrorToDisk	registry based	NA	NA	OK
8	MirrorToDisk	OCI file based	NA	NA	OK
8	DiskToMirror	registry based	no	NA	OK
8	DiskToMirror	OCI file based	no	NA	OK
8	DiskToMirror	registry based	yes	no	not tested
8	DiskToMirror	OCI file based	yes	no	not tested
8	DiskToMirror	registry based	yes	yes	OK
8	DiskToMirror	OCI file based	yes	yes	OK

Expected Outcome

The mirroring completes without errors, and the catalog is available on the mirror registry.
Not tested:

• For catalogs mirrored without --rebuild-catalogs
• The catalogsource should be deployable on the cluster, regardless of the catalog version (v4.15 or v4.14, etc)
• oc-mirror should work on rhel8 and rhel9 systems
• For catalogs mirrored with --rebuild-catalogs and OPM_BINARY defined
• The catalogsource should be deployable on the cluster, regardless of the catalog version (v4.15 or v4.14, etc)
• oc-mirror should work on rhel8 and rhel9 systems provided that the OPM_BINARY chosen corresponds to the os.

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

@sherine-k: 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.

[kasturinarra]

/lgtm

[kasturinarra]

/label qe-approved

[openshift-ci-robot]

@sherine-k: Jira Issue OCPBUGS-31536: All pull requests linked via external trackers have merged:

• openshift/oc-mirror#844
• openshift/oc-mirror#847

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

In response to this:

Description

This PR fixes a regression introduced by PR #844.
Mirroring M2M and M2D for registry based catalogs was failing with error :

oc adm catalog mirror [file://rhceph-dev/ocs-registry:4.16.0-92](file:///ocs-registry:4.16.0-92) REGISTRY/REPOSITORY
error: lstat /home/jenkins/quay.io: no such file or directory

Fixes OCPBUGS-31536

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?

Using the following imageSetConfig:

apiVersion: mirror.openshift.io/v1alpha2
mirror:
 operators:
 - catalog: quay.io/skhoury/oc-mirror-dev:test-catalog-latest
   packages: 
   - name: foo
 
 - catalog: oci:///home/skhoury/testcatalog
   # targetCatalog: oc-mirror-dev:oci
   packages: 
   - name: bar

Test matrix

Test	workflow	catalog type	rebuildCatalogs	use OPM_BINARY	result
1	MirrorToMirror	registry based	no	NA	OK
2	MirrorToMirror	OCI file based	no	NA	OK
3	MirrorToMirror	registry based	yes	no	OK
4	MirrorToMirror	OCI file based	yes	no	not tested
5	MirrorToMirror	registry based	yes	yes	OK
6	MirrorToMirror	OCI file based	yes	yes	OK
7	MirrorToDisk	registry based	NA	NA	OK
8	MirrorToDisk	OCI file based	NA	NA	OK
9	DiskToMirror	registry based	no	NA	OK
10	DiskToMirror	OCI file based	no	NA	OK
11	DiskToMirror	registry based	yes	no	not tested
12	DiskToMirror	OCI file based	yes	no	not tested
13	DiskToMirror	registry based	yes	yes	OK
14	DiskToMirror	OCI file based	yes	yes	OK

Expected Outcome

The mirroring completes without errors, and the catalog is available on the mirror registry.
Not tested:

• For catalogs mirrored without --rebuild-catalogs
• The catalogsource should be deployable on the cluster, regardless of the catalog version (v4.15 or v4.14, etc)
• oc-mirror should work on rhel8 and rhel9 systems
• For catalogs mirrored with --rebuild-catalogs and OPM_BINARY defined
• The catalogsource should be deployable on the cluster, regardless of the catalog version (v4.15 or v4.14, etc)
• oc-mirror should work on rhel8 and rhel9 systems provided that the OPM_BINARY chosen corresponds to the os.

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build oc-mirror-plugin-container-v4.16.0-202405101842.p0.g2cb9f07.assembly.stream.el9 for distgit oc-mirror-plugin.
All builds following this will include this PR.

[sherine-k]

/cherrypick release-4.15

[openshift-cherrypick-robot]

@sherine-k: #847 failed to apply on top of branch "release-4.15":

Applying: Revert "OCPBUGS-31536: Change default behavior to not rebuild catalogs for V1 (#844)"
Using index info to reconstruct a base tree...
M	pkg/cli/mirror/catalog_images.go
M	pkg/cli/mirror/fbc_operators.go
M	pkg/cli/mirror/mirror.go
M	pkg/cli/mirror/operator.go
M	pkg/cli/mirror/options.go
M	pkg/cli/mirror/publish.go
M	test/e2e/lib/workflow.sh
M	test/e2e/testcases.sh
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/testcases.sh
CONFLICT (content): Merge conflict in test/e2e/testcases.sh
Auto-merging test/e2e/lib/workflow.sh
Auto-merging pkg/cli/mirror/publish.go
Auto-merging pkg/cli/mirror/options.go
Auto-merging pkg/cli/mirror/mirror.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Revert "OCPBUGS-31536: Change default behavior to not rebuild catalogs for V1 (#844)"
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-4.15

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.

[openshift-merge-robot]

Fix included in accepted release 4.16.0-0.nightly-2024-05-16-092402

[openshift-merge-robot]

Fix included in accepted release 4.15.0-0.nightly-2024-05-22-090458