Skip to content

Conversation

@kalexand-rh
Copy link
Contributor

@kalexand-rh kalexand-rh commented Oct 27, 2023

4.14 only

QE not required

Related to https://issues.redhat.com/browse/CCSENABLE-529

Preview: https://67051--docspreview.netlify.app/openshift-enterprise/latest/support/getting-support

If you click the link, it should try to open a Jira in the OCPBUGS project with a 4.14 affects version.

@kalexand-rh kalexand-rh added this to the Planned for 4.14 GA milestone Oct 27, 2023
@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 27, 2023
@ocpdocs-previewbot
Copy link

@kalexand-rh kalexand-rh added the peer-review-needed Signifies that the peer review team needs to review this PR label Oct 27, 2023
@bburt-rh bburt-rh added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Oct 27, 2023
Copy link
Contributor

@bburt-rh bburt-rh left a comment

Choose a reason for hiding this comment

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

lgtm

@bburt-rh bburt-rh added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR peer-review-needed Signifies that the peer review team needs to review this PR labels Oct 27, 2023
@kalexand-rh kalexand-rh merged commit 11253f3 into openshift:enterprise-4.14 Oct 27, 2023
@bergerhoffer
Copy link
Contributor

bergerhoffer commented Nov 30, 2023

@kalexand-rh we're seeing a merge conflict due to this change, that it went to 4.14/4.15 and not main. Can this be cherry picked to main too?

@kalexand-rh
Copy link
Contributor Author

kalexand-rh commented Nov 30, 2023

@bergerhoffer, it's version-specific, but there's no reason it couldn't go to main. I also think that it's small enough to risk a bot CP to main. If that goes poorly, I'll open a manual one.

@kalexand-rh
Copy link
Contributor Author

/cherrypick main

@openshift-cherrypick-robot

@kalexand-rh: #67051 failed to apply on top of branch "main":

Applying: adjusting Jira link for 4.14
Using index info to reconstruct a base tree...
M	modules/support.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/support.adoc
CONFLICT (content): Merge conflict in modules/support.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 adjusting Jira link for 4.14
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 main

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.

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

Labels

branch/enterprise-4.14 peer-review-done Signifies that the peer review team has reviewed this PR size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants