Skip to content

MIG-412: MTC migration rollback (1.4.0) #27373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
apinnick merged 1 commit into from
Feb 9, 2021
Merged

MIG-412: MTC migration rollback (1.4.0) #27373

apinnick merged 1 commit into from
Feb 9, 2021

Conversation

@apinnick
Copy link
Contributor

@apinnick apinnick commented Nov 15, 2020 •
edited
Loading

https://issues.redhat.com/browse/MIG-412

MTC 1.4 (Feb 10)

CP to 4.5, 4.6, 4.7

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 15, 2020
@openshift-docs-preview-bot
Copy link

openshift-docs-preview-bot commented Nov 15, 2020

The preview will be available shortly at:

@apinnick apinnick force-pushed the MIG412-mtc-migration-rollback branch 2 times, most recently from d7da3a6 to d999098 Compare November 15, 2020 14:08
@apinnick apinnick force-pushed the MIG412-mtc-migration-rollback branch 3 times, most recently from 63448de to c0e6d37 Compare November 30, 2020 15:57
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 1, 2020
@apinnick apinnick force-pushed the MIG412-mtc-migration-rollback branch from c0e6d37 to 894587c Compare December 1, 2020 08:32
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 1, 2020
@apinnick apinnick force-pushed the MIG412-mtc-migration-rollback branch from 894587c to 2134d25 Compare December 6, 2020 09:39
@apinnick apinnick force-pushed the MIG412-mtc-migration-rollback branch from 2134d25 to bf30ff0 Compare December 14, 2020 09:04
@sergiordlr
Copy link

sergiordlr commented Dec 14, 2020

It looks good to me.

Thank you very much!!

@apinnick apinnick marked this pull request as ready for review December 14, 2020 10:15
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 14, 2020
@apinnick apinnick force-pushed the MIG412-mtc-migration-rollback branch from bf30ff0 to 913906a Compare December 14, 2020 10:18
sfortner-RH
sfortner-RH suggested changes Dec 14, 2020
View reviewed changes
Copy link
Contributor

@sfortner-RH sfortner-RH left a comment

Choose a reason for hiding this comment

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

I left comments concerning modularization and few other nit picks.

I've asked @kalexand-rh to also review this PR to ensure I've covered the main issues from a modularization perspective.

@apinnick apinnick force-pushed the MIG412-mtc-migration-rollback branch from 913906a to c460340 Compare December 14, 2020 15:46
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 14, 2020
@apinnick apinnick requested a review from sfortner-RH December 14, 2020 15:48
@apinnick apinnick force-pushed the MIG412-mtc-migration-rollback branch 3 times, most recently from 1f09267 to 4439e37 Compare December 14, 2020 16:06
kalexand-rh
kalexand-rh reviewed Dec 14, 2020
View reviewed changes
kalexand-rh
kalexand-rh reviewed Dec 14, 2020
View reviewed changes
@apinnick
Copy link
Contributor Author

apinnick commented Dec 16, 2020

@kalexand-rh I responded to your comments. Could you please merge?

@apinnick apinnick force-pushed the MIG412-mtc-migration-rollback branch 3 times, most recently from 3343c71 to 9f990cc Compare December 20, 2020 08:17
@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 20, 2020
@apinnick apinnick force-pushed the MIG412-mtc-migration-rollback branch 3 times, most recently from df1a889 to cf7b249 Compare December 21, 2020 09:20
@apinnick apinnick force-pushed the MIG412-mtc-migration-rollback branch from cf7b249 to 67dbb5b Compare January 20, 2021 13:52
@apinnick
Roll back migration
a482ec3 
This reverts commit b40c95d1f19b560f3b5b5bfeea2d0d0a6f1d3980.
@apinnick apinnick force-pushed the MIG412-mtc-migration-rollback branch from 67dbb5b to a482ec3 Compare January 28, 2021 11:33
@netlify
Copy link

netlify bot commented Jan 28, 2021

Deploy preview for osdocs ready!

Built with commit a482ec3

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

@apinnick apinnick changed the title MIG-412: MTC migration rollback MIG-412: MTC migration rollback (1.4.0) Jan 31, 2021
@apinnick apinnick 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 labels Feb 2, 2021
@apinnick apinnick merged commit 4f678c3 into openshift:master Feb 9, 2021
@apinnick apinnick deleted the MIG412-mtc-migration-rollback branch February 9, 2021 10:07
@apinnick
Copy link
Contributor Author

apinnick commented Feb 9, 2021

/cherry-pick enterprise-4.5

@apinnick
Copy link
Contributor Author

apinnick commented Feb 9, 2021

/cherrypick enterprise-4.6

@apinnick
Copy link
Contributor Author

apinnick commented Feb 9, 2021

/cherrypick enterprise-4.7

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 9, 2021

@apinnick: #27373 failed to apply on top of branch "enterprise-4.5":

Applying: Roll back migration
Using index info to reconstruct a base tree...
M	migration/migrating_3_4/troubleshooting-3-4.adoc
M	migration/migrating_4_1_4/troubleshooting-4-1-4.adoc
M	migration/migrating_4_2_4/troubleshooting-4-2-4.adoc
M	modules/migration-running-migration-plan-cam.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/migration-running-migration-plan-cam.adoc
Removing modules/migration-manually-rolling-back-migration.adoc
Auto-merging migration/migrating_4_2_4/troubleshooting-4-2-4.adoc
CONFLICT (content): Merge conflict in migration/migrating_4_2_4/troubleshooting-4-2-4.adoc
Auto-merging migration/migrating_4_1_4/troubleshooting-4-1-4.adoc
CONFLICT (content): Merge conflict in migration/migrating_4_1_4/troubleshooting-4-1-4.adoc
Auto-merging migration/migrating_3_4/troubleshooting-3-4.adoc
CONFLICT (content): Merge conflict in migration/migrating_3_4/troubleshooting-3-4.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 Roll back migration
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:

/cherry-pick 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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 9, 2021
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 9, 2021

@apinnick: new pull request created: #29279

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
Copy link

openshift-cherrypick-robot commented Feb 9, 2021

@apinnick: new pull request created: #29280

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 openshift-cherrypick-robot mentioned this pull request Feb 9, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bergerhoffer bergerhoffer bergerhoffer left review comments

@kalexand-rh kalexand-rh kalexand-rh left review comments

@sfortner-RH sfortner-RH Awaiting requested review from sfortner-RH

+1 more reviewer

@vikram-redhat vikram-redhat vikram-redhat left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@apinnick @openshift-docs-preview-bot @sergiordlr @openshift-cherrypick-robot @vikram-redhat @bergerhoffer @kalexand-rh @sfortner-RH @openshift-ci-robot