OCPBUGS#31071: Changing catalog source name in disconnected workflow

[rohennes]

OCPBUGS-31071: Changing catalog source name in disconnected workflow as its a custom catalog and cannot be the same name as default catalog

Version(s):
4.12+

Issue:
https://issues.redhat.com/browse/OCPBUGS-31071

Link to docs preview:

• https://80859--ocpdocs-pr.netlify.app/openshift-enterprise/latest/edge_computing/policygenerator_for_ztp/ztp-talm-updating-managed-policies-pg.html
• https://80859--ocpdocs-pr.netlify.app/openshift-enterprise/latest/edge_computing/policygentemplate_for_ztp/ztp-talm-updating-managed-policies.html

QE review:

• QE has approved this change.

Additional information:

[openshift-ci-robot]

@rohennes: This pull request references Jira Issue OCPBUGS-31071, which is invalid:

• expected the bug to target the "4.18.0" version, but no target version was set
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED 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.

Details

In response to this:

OCPBUGS-31071: Changing catalog source name in disconnected workflow as its a custom catalog and cannot be the same name as default catalog

Version(s):
4.12+

Issue:

Link to docs preview:

QE review:

• QE has approved this change.

Additional information:

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.

[ocpdocs-previewbot]

🤖 Mon Sep 02 15:09:19 - Prow CI generated the docs preview:

https://80859--ocpdocs-pr.netlify.app/
https://80859--ocpdocs-pr.netlify.app/openshift-enterprise/latest/edge_computing/policygenerator_for_ztp/ztp-talm-updating-managed-policies-pg.html
https://80859--ocpdocs-pr.netlify.app/openshift-enterprise/latest/edge_computing/policygentemplate_for_ztp/ztp-talm-updating-managed-policies.html

[josclark42]

/lgtm

[openshift-ci]

@josclark42: changing LGTM is restricted to collaborators

Details

In response to this:

/lgtm

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.

[rohennes]

/label peer-review-needed

[jldohmann]

looks great! LGTM

[imiller0]

Can this be redhat-operators-disconnected so that it matches the reference:
https://github.com/openshift-kni/cnf-features-deploy/blob/master/ztp/gitops-subscriptions/argocd/example/policygentemplates/common-ranGen.yaml#L87
Thank you!

[rohennes]

Thanks @imiller0 - I've updated the instances accordingly

[rohennes]

@imiller0 - Any other issues or can I get this update merged? Thanks

[openshift-ci]

@rohennes: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

[openshift-ci-robot]

@rohennes: This pull request references Jira Issue OCPBUGS-31071, which is invalid:

• expected the bug to target the "4.18.0" version, but no target version was set
• expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified 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.

Details

In response to this:

OCPBUGS-31071: Changing catalog source name in disconnected workflow as its a custom catalog and cannot be the same name as default catalog

Version(s):
4.12+

Issue:
https://issues.redhat.com/browse/OCPBUGS-31071

Link to docs preview:

• https://80859--ocpdocs-pr.netlify.app/openshift-enterprise/latest/edge_computing/policygenerator_for_ztp/ztp-talm-updating-managed-policies-pg.html
• https://80859--ocpdocs-pr.netlify.app/openshift-enterprise/latest/edge_computing/policygentemplate_for_ztp/ztp-talm-updating-managed-policies.html

QE review:

• QE has approved this change.

Additional information:

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.

[rohennes]

/label merge-review-needed

[ShaunaDiaz]

@rohennes Please get QE ack on the PR itself prior to merge. I see the task checked, but no QE ack on this one.

[rohennes]

@rohennes Please get QE ack on the PR itself prior to merge. I see the task checked, but no QE ack on this one.

Hi Shauna, josclark42 is the QE and has given this LGTM above on this PR. (Joshua Clark)

[rohennes]

Just a reminder about this one @ShaunaDiaz in case it slipped through the cracks, thanks!

[openshift-ci-robot]

@rohennes: Jira Issue OCPBUGS-31071 is in an unrecognized state (Verified) and will not be moved to the MODIFIED state.

Details

In response to this:

OCPBUGS-31071: Changing catalog source name in disconnected workflow as its a custom catalog and cannot be the same name as default catalog

Version(s):
4.12+

Issue:
https://issues.redhat.com/browse/OCPBUGS-31071

Link to docs preview:

• https://80859--ocpdocs-pr.netlify.app/openshift-enterprise/latest/edge_computing/policygenerator_for_ztp/ztp-talm-updating-managed-policies-pg.html
• https://80859--ocpdocs-pr.netlify.app/openshift-enterprise/latest/edge_computing/policygentemplate_for_ztp/ztp-talm-updating-managed-policies.html

QE review:

• QE has approved this change.

Additional information:

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.

[ShaunaDiaz]

/cherrypick enterprise-4.12

[ShaunaDiaz]

/cherrypick enterprise-4.13

[ShaunaDiaz]

/cherrypick enterprise-4.14

[ShaunaDiaz]

/cherrypick enterprise-4.15

[ShaunaDiaz]

/cherrypick enterprise-4.16

[ShaunaDiaz]

/cherrypick enterprise-4.17

[ShaunaDiaz]

Just a reminder about this one @ShaunaDiaz in case it slipped through the cracks, thanks!

The usual flow would be to put the merge-review-needed label back on in case the original reviewer is out after you got QE, etc.

[openshift-cherrypick-robot]

@ShaunaDiaz: #80859 failed to apply on top of branch "enterprise-4.12":

Applying: OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog
Using index info to reconstruct a base tree...
M	modules/cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
M	modules/cnf-topology-aware-lifecycle-manager-operator-update.adoc
A	snippets/pg-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
A	snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc
A	snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
A	snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-update.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-update.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-update.adoc left in tree.
CONFLICT (modify/delete): snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc left in tree.
CONFLICT (modify/delete): snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc left in tree.
CONFLICT (modify/delete): snippets/pg-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pg-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc left in tree.
Auto-merging modules/cnf-topology-aware-lifecycle-manager-operator-update.adoc
Auto-merging modules/cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog
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".

Details

In response to this:

/cherrypick enterprise-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-sigs/prow repository.

[openshift-cherrypick-robot]

@ShaunaDiaz: #80859 failed to apply on top of branch "enterprise-4.13":

Applying: OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog
Using index info to reconstruct a base tree...
M	modules/cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
M	modules/cnf-topology-aware-lifecycle-manager-operator-update.adoc
A	snippets/pg-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
A	snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc
A	snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
A	snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-update.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-update.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-update.adoc left in tree.
CONFLICT (modify/delete): snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc left in tree.
CONFLICT (modify/delete): snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc left in tree.
CONFLICT (modify/delete): snippets/pg-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pg-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc left in tree.
Auto-merging modules/cnf-topology-aware-lifecycle-manager-operator-update.adoc
Auto-merging modules/cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog
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".

Details

In response to this:

/cherrypick enterprise-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-sigs/prow repository.

[openshift-cherrypick-robot]

@ShaunaDiaz: #80859 failed to apply on top of branch "enterprise-4.14":

Applying: OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog
Using index info to reconstruct a base tree...
M	modules/cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
M	modules/cnf-topology-aware-lifecycle-manager-operator-update.adoc
A	snippets/pg-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
A	snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc
A	snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
A	snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-update.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-update.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-update.adoc left in tree.
CONFLICT (modify/delete): snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc left in tree.
CONFLICT (modify/delete): snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc left in tree.
CONFLICT (modify/delete): snippets/pg-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pg-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc left in tree.
Auto-merging modules/cnf-topology-aware-lifecycle-manager-operator-update.adoc
Auto-merging modules/cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog
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".

Details

In response to this:

/cherrypick enterprise-4.14

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-cherrypick-robot]

@ShaunaDiaz: #80859 failed to apply on top of branch "enterprise-4.15":

Applying: OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog
Using index info to reconstruct a base tree...
M	modules/cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
M	modules/cnf-topology-aware-lifecycle-manager-operator-update.adoc
A	snippets/pg-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
A	snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc
A	snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
A	snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-update.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-update.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-update.adoc left in tree.
CONFLICT (modify/delete): snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pgt-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc left in tree.
CONFLICT (modify/delete): snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pg-cnf-topology-aware-lifecycle-manager-operator-update.adoc left in tree.
CONFLICT (modify/delete): snippets/pg-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc deleted in HEAD and modified in OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog. Version OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog of snippets/pg-cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc left in tree.
Auto-merging modules/cnf-topology-aware-lifecycle-manager-operator-update.adoc
Auto-merging modules/cnf-topology-aware-lifecycle-manager-operator-troubleshooting.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-31071: Changing catalog source name as its a custom catalog and cannot be the same name as default catalog
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".

Details

In response to this:

/cherrypick enterprise-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-cherrypick-robot]

@ShaunaDiaz: new pull request created: #81717

Details

In response to this:

/cherrypick enterprise-4.16

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-cherrypick-robot]

@ShaunaDiaz: new pull request created: #81718

Details

In response to this:

/cherrypick enterprise-4.17

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.

[ShaunaDiaz]

@rohennes You can make the PCs and Slack me for merge, or put in the queue.