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

Fixed alerting cypress tests. #1500

Merged

Conversation

AWSHurneyt
Copy link
Contributor

@AWSHurneyt AWSHurneyt commented Aug 3, 2024

Description

Fixed alerting cypress tests.

Please backport this PR to 2.x, and 2.16.

Testing

The 2 tests updated by this PR are passing on a docker image cluster with security enabled.
Screenshot 2024-08-02 at 7 47 48 PM
Screenshot 2024-08-02 at 7 55 20 PM

Issues Resolved

opensearch-project/alerting-dashboards-plugin#1011

Check List

  • Commits are signed per the DCO using --signoff

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.

@prudhvigodithi prudhvigodithi merged commit 5ce06df into opensearch-project:main Aug 3, 2024
39 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 3, 2024
Signed-off-by: AWSHurneyt <[email protected]>
(cherry picked from commit 5ce06df)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 3, 2024
Signed-off-by: AWSHurneyt <[email protected]>
(cherry picked from commit 5ce06df)
SuZhou-Joe pushed a commit that referenced this pull request Aug 4, 2024
Signed-off-by: AWSHurneyt <[email protected]>
(cherry picked from commit 5ce06df)

Co-authored-by: AWSHurneyt <[email protected]>
SuZhou-Joe pushed a commit that referenced this pull request Aug 4, 2024
Signed-off-by: AWSHurneyt <[email protected]>
(cherry picked from commit 5ce06df)

Co-authored-by: AWSHurneyt <[email protected]>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.15 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-2.15 2.15
# Navigate to the new working tree
cd .worktrees/backport-2.15
# Create a new branch
git switch --create backport/backport-1500-to-2.15
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5ce06df44fc58ddb303934e71ce8409cccc5cb33
# Push it to GitHub
git push --set-upstream origin backport/backport-1500-to-2.15
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.15

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

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.

4 participants