Skip to content
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.

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

Add upgrade test into E2E tests #4058

Conversation

danfengliu
Copy link
Contributor

@danfengliu danfengliu commented Aug 21, 2021

Signed-off-by: danfengl danfengl@vmware.com

Thank you for contributing to Velero!

Please add a summary of your change

Add upgrade test in E2E test.

Does your change fix a particular issue?

Fixes #4029

Please indicate you've done the following:

@danfengliu danfengliu force-pushed the add-upgrade-test-in-e2e-with-kibishii branch 2 times, most recently from 520b17b to a420207 Compare August 22, 2021 13:35
@danfengliu danfengliu force-pushed the add-upgrade-test-in-e2e-with-kibishii branch 3 times, most recently from b228c1d to 6a8e716 Compare September 1, 2021 14:46
Copy link
Contributor

@zubron zubron left a comment

Choose a reason for hiding this comment

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

Thanks for this, @danfengliu! This is looking great so far :) I've done a lot of upgrade testing recently so I know this is a really complex test to write so thank you for taking this on :)

I have a few comments and suggestions. My main request is that we should be using the upgrade instructions from the website as I don't think calling install again will replace the CRDs and update the deployment. Also, I think that it should be the responsibility of the runner of these tests to provide the binary to use rather than this code downloading it.

I think the flow of the test should be

  1. Install with the upgrade-from binary (and don't set the image to use, let the binary use the default image)
  2. Perform the backup using upgrade-from binary
  3. Upgrade by explicitly installing the new CRDs and upgrading the image in the deployment/daemonset using the CLI and image that are being tested (the PR/nightly build). In future we should consider adding an "upgrade" command to the CLI to improve this user experience, but that's a problem for another time :)
  4. Use the new CLI that's being tested to perform the restore.

I hope my comments makes sense! Let me know if anything is unclear 👍

test/e2e/e2e_suite_test.go Outdated Show resolved Hide resolved
test/e2e/upgrade_test.go Outdated Show resolved Hide resolved
test/e2e/velero_utils.go Outdated Show resolved Hide resolved
test/e2e/velero_utils.go Show resolved Hide resolved
test/e2e/upgrade_test.go Outdated Show resolved Hide resolved
test/e2e/upgrade_test.go Show resolved Hide resolved
test/e2e/upgrade_test.go Outdated Show resolved Hide resolved
test/e2e/upgrade_test_test.go Outdated Show resolved Hide resolved
test/e2e/upgrade_test_test.go Outdated Show resolved Hide resolved
test/e2e/upgrade_test.go Outdated Show resolved Hide resolved
test/e2e/kibishii.go Outdated Show resolved Hide resolved
test/e2e/kibishii.go Outdated Show resolved Hide resolved
test/e2e/kibishii.go Outdated Show resolved Hide resolved
test/e2e/upgrade_test.go Outdated Show resolved Hide resolved
test/e2e/velero_utils.go Outdated Show resolved Hide resolved
@ywk253100
Copy link
Contributor

@danfengliu Please resolve the conflict either

@danfengliu danfengliu force-pushed the add-upgrade-test-in-e2e-with-kibishii branch 9 times, most recently from 204aa81 to 78df815 Compare September 3, 2021 13:57
test/e2e/Makefile Outdated Show resolved Hide resolved
test/e2e/Makefile Outdated Show resolved Hide resolved
test/e2e/Makefile Outdated Show resolved Hide resolved
@danfengliu danfengliu force-pushed the add-upgrade-test-in-e2e-with-kibishii branch 4 times, most recently from 181986a to 36d415e Compare September 4, 2021 12:12
Copy link
Contributor

@zubron zubron left a comment

Choose a reason for hiding this comment

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

Thanks for making the suggested changes :) I have a few more comments but it's looking good 👍

test/e2e/upgrade_test.go Outdated Show resolved Hide resolved
test/e2e/upgrade_test.go Show resolved Hide resolved
test/e2e/upgrade_test.go Show resolved Hide resolved
test/e2e/velero_utils.go Outdated Show resolved Hide resolved
@danfengliu danfengliu force-pushed the add-upgrade-test-in-e2e-with-kibishii branch 6 times, most recently from 23a2266 to 2cc69d8 Compare September 6, 2021 11:01
ywk253100
ywk253100 previously approved these changes Sep 7, 2021
Copy link
Contributor

@ywk253100 ywk253100 left a comment

Choose a reason for hiding this comment

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

Thanks

Copy link
Contributor

@zubron zubron left a comment

Choose a reason for hiding this comment

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

Thanks for this, @danfengliu! I am happy for this to be merged, I just want to check if we can go back to using the upstream version of kibishii rather than a fork.

test/e2e/velero_utils.go Outdated Show resolved Hide resolved
test/e2e/kibishii_utils.go Outdated Show resolved Hide resolved
@danfengliu danfengliu force-pushed the add-upgrade-test-in-e2e-with-kibishii branch 6 times, most recently from 714693e to f4f1276 Compare September 8, 2021 12:26
Signed-off-by: danfengl <danfengl@vmware.com>
@danfengliu danfengliu force-pushed the add-upgrade-test-in-e2e-with-kibishii branch from f4f1276 to 4db866a Compare September 8, 2021 13:17
Copy link
Contributor

@zubron zubron left a comment

Choose a reason for hiding this comment

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

LGTM - thanks!

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

Successfully merging this pull request may close these issues.

Add upgrade test in E2E test
3 participants