Skip to content

[Backport 7.x] Implement wipe cluster settings for YAML tests #5531

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

Merged
merged 2 commits into from
Apr 8, 2021

Conversation

stevejgordon
Copy link
Contributor

Backport ddc2801 from #5527

* Implement wipe cluster settings
* Unskip cluster settings tests
* Remove redundant skip
* Update skip comment
* Reuse settings for return
* Unskip cluster voting config
* Update skip comment
* Cleanup file
* Unskip a test and add extra comments
* Remove ML skip
* Remove skip which now passes
* Remove skip where file does not exist
* Cleanup

(cherry picked from commit ddc2801)
@stevejgordon stevejgordon reopened this Apr 8, 2021
@stevejgordon stevejgordon merged commit 145f035 into 7.x Apr 8, 2021
@stevejgordon stevejgordon deleted the backport-5527-to-7.x branch April 8, 2021 09:25
@github-actions
Copy link
Contributor

github-actions bot commented Apr 8, 2021

The backport to 7.11 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.11 7.11
# Navigate to the new working tree
cd .worktrees/backport-7.11
# Create a new branch
git switch --create backport-5531-to-7.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 145f035c2d661ae0c66cdff830d8d7e82b67095b
# Push it to GitHub
git push --set-upstream origin backport-5531-to-7.11
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.11

Then, create a pull request where the base branch is 7.11 and the compare/head branch is backport-5531-to-7.11.

@github-actions
Copy link
Contributor

github-actions bot commented Apr 8, 2021

The backport to 7.12 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.12 7.12
# Navigate to the new working tree
cd .worktrees/backport-7.12
# Create a new branch
git switch --create backport-5531-to-7.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 145f035c2d661ae0c66cdff830d8d7e82b67095b
# Push it to GitHub
git push --set-upstream origin backport-5531-to-7.12
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.12

Then, create a pull request where the base branch is 7.12 and the compare/head branch is backport-5531-to-7.12.

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

Successfully merging this pull request may close these issues.

1 participant