Closed AWSHurneyt closed 6 months ago
typically we create smaller PRs. one for each issue is a practice we should try follow
The nonsecurity-related test failures seem related to the fixes in PR https://github.com/opensearch-project/alerting/pull/1464
The security-related test failures have been failing for some time, so they're unrelated to these changes. https://github.com/opensearch-project/alerting/actions/workflows/security-test-workflow.yml?query=branch%3Amain
typically we create smaller PRs. one for each issue is a practice we should try follow
@eirsep agreed. Would you say that's blocking for this PR? All of the changes will require the AlertContext class, so the second PR couldn't be raised until the first is merged.
The backport to 2.x
failed:
The process '/usr/bin/git' failed with exit code 128
To backport manually, run these commands in your terminal:
# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-2.x
# Create a new branch
git switch --create backport-1450-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5dc690caf1d4b9935f9aeb946c104be8d4861a77
# Push it to GitHub
git push --set-upstream origin backport-1450-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-2.x
Then, create a pull request where the base
branch is 2.x
and the compare
/head
branch is backport-1450-to-2.x
.
The backport to 2.11
failed:
The process '/usr/bin/git' failed with exit code 128
To backport manually, run these commands in your terminal:
# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting/backport-2.11 2.11
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-2.11
# Create a new branch
git switch --create backport-1450-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5dc690caf1d4b9935f9aeb946c104be8d4861a77
# Push it to GitHub
git push --set-upstream origin backport-1450-to-2.11
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-2.11
Then, create a pull request where the base
branch is 2.11
and the compare
/head
branch is backport-1450-to-2.11
.
Issue #, if available: https://github.com/opensearch-project/alerting/issues/1300 https://github.com/opensearch-project/alerting/issues/1396 https://github.com/opensearch-project/alerting/issues/1401
Description of changes:
CheckList:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. For more information on following Developer Certificate of Origin and signing off your commits, please check here.