Skip to content

Conversation

@wking
Copy link
Member

@wking wking commented Apr 30, 2021

If we supported them at some point, we will continue to support the edges even if they are no longer recommended.

…l supported

If we supported them at some point, we will continue to support the
edges even if they are no longer recommended.
@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 30, 2021
@netlify
Copy link

netlify bot commented Apr 30, 2021

Deploy preview for osdocs ready!

Built with commit 26e6938

https://deploy-preview-32091--osdocs.netlify.app

@codyhoag codyhoag self-requested a review April 30, 2021 18:05
@codyhoag
Copy link
Contributor

@jiajliu can you ACK from a QE perspective?

@sferich888 since this is updating some support statements, can you confirm?

@sferich888
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 30, 2021
@jeana-redhat
Copy link
Contributor

@sferich888 I'm going to label this with 4.5+ to mark it for cherrypicking into all current and future branches. Let me know if any of those should be omitted.

@sdodson
Copy link
Member

sdodson commented May 24, 2021

@jeana-redhat @codyhoag What's left to move this out? Given that this is all after QE has signed off on releases (we only ship errata after their sign off) I'm not sure they'll be concerned about this change at all.

@jiajliu
Copy link

jiajliu commented May 25, 2021

LGTM.

@jeana-redhat
Copy link
Contributor

@sdodson thanks for following up. Looks like we thought we needed QE ack, and now we have it even though as you say it's not required. Only outstanding question as far as I know is confirmation that this goes into all releases (4.5+) - do you know if that's right? If so, I'll review for docs compliance and merge/cherrypick.

@jeana-redhat jeana-redhat added the peer-review-needed Signifies that the peer review team needs to review this PR label May 25, 2021
@jeana-redhat jeana-redhat self-requested a review May 25, 2021 16:05
@jeana-redhat jeana-redhat added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels May 25, 2021
Copy link
Contributor

@jeana-redhat jeana-redhat left a comment

Choose a reason for hiding this comment

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

docs review: lgtm

@sdodson
Copy link
Member

sdodson commented May 25, 2021

@jeana-redhat yes, all currently supported versions is fine

@jeana-redhat jeana-redhat merged commit d52d73e into openshift:master May 25, 2021
@jeana-redhat jeana-redhat added this to the Next Release milestone May 25, 2021
@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.8

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.7

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.6

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.5

@openshift-cherrypick-robot

@jeana-redhat: new pull request created: #32814

Details

In response to this:

/cherrypick enterprise-4.8

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.

@jeana-redhat
Copy link
Contributor

@sdodson ACK and done - tyvm! 👍

@openshift-cherrypick-robot

@jeana-redhat: #32091 failed to apply on top of branch "enterprise-4.7":

Applying: modules/understanding-upgrade-channels: Blocked update edges are still supported
Using index info to reconstruct a base tree...
M	modules/understanding-upgrade-channels.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/understanding-upgrade-channels.adoc
CONFLICT (content): Merge conflict in modules/understanding-upgrade-channels.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 modules/understanding-upgrade-channels: Blocked update edges are still supported
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.7

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

@jeana-redhat: new pull request created: #32815

Details

In response to this:

/cherrypick enterprise-4.6

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

@jeana-redhat: new pull request created: #32816

Details

In response to this:

/cherrypick enterprise-4.5

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.

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.7

@openshift-cherrypick-robot

@jeana-redhat: #32091 failed to apply on top of branch "enterprise-4.7":

Applying: modules/understanding-upgrade-channels: Blocked update edges are still supported
Using index info to reconstruct a base tree...
M	modules/understanding-upgrade-channels.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/understanding-upgrade-channels.adoc
CONFLICT (content): Merge conflict in modules/understanding-upgrade-channels.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 modules/understanding-upgrade-channels: Blocked update edges are still supported
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.7

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.

@wking wking deleted the once-updates-are-supported-they-are-always-supported branch May 25, 2021 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 lgtm Indicates that a PR is ready to be merged. 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.

9 participants