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

backupccl: update backupAndRestore test helper #90621

Merged
merged 1 commit into from
Nov 1, 2022

Conversation

msbutler
Copy link
Collaborator

@msbutler msbutler commented Oct 25, 2022

Informs #90620

This patch updates the backupAndRestore test helper to:

  • use the new backup/restore syntax
  • removes an unecessary test cluster spin up
  • simplifies a bunch of logic around external storage format
  • adds an incremental backup

With this patch, our TestCloudBackupRestore* tests will now exercise the
required external storage calls (e.g. listing) for the new backup directory
structure.

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@msbutler msbutler force-pushed the butler-backuprestore-test branch from b282ad0 to 6c28fed Compare October 25, 2022 16:39
Informs cockroachdb#90620

This patch updates the backupAndRestore test helper to:
- use the new backup/restore syntax
- removes an unecessary test cluster spin up
- simplifies a bunch of logic around external storage format
- adds an incremental backup

With this patch, our TestCloudBackupRestore* tests will now exercise the
required external storage calls (e.g. listing) for the new backup directory
structure.

Release note: none
@msbutler msbutler force-pushed the butler-backuprestore-test branch from 6c28fed to f8d42f1 Compare October 27, 2022 14:00
@msbutler msbutler self-assigned this Oct 27, 2022
@msbutler msbutler marked this pull request as ready for review October 27, 2022 14:01
@msbutler msbutler requested a review from a team as a code owner October 27, 2022 14:01
@msbutler msbutler requested review from benbardin, stevendanna and adityamaru and removed request for a team and benbardin October 27, 2022 14:01
Copy link
Contributor

@adityamaru adityamaru left a comment

Choose a reason for hiding this comment

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

LGTM, but just run the TC job once to sanity check.

@msbutler
Copy link
Collaborator Author

msbutler commented Nov 1, 2022

passed with flying colors!

https://teamcity.cockroachdb.com/viewLog.html?buildId=7263626&buildTypeId=Cockroach_Nightlies_CloudUnitTests

Mysteriously, TestPutAWSKMSEndpoint and TestPutS3Endpoint are currently ignored here, and on master. I'll dig a bit, but merge this PR.

@msbutler
Copy link
Collaborator Author

msbutler commented Nov 1, 2022

bors r=adityamaru

@craig
Copy link
Contributor

craig bot commented Nov 1, 2022

Build succeeded:

@craig craig bot merged commit 82fdf05 into cockroachdb:master Nov 1, 2022
@msbutler msbutler deleted the butler-backuprestore-test branch November 2, 2022 04:58
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.

3 participants