-
Notifications
You must be signed in to change notification settings - Fork 49
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
Fix cypress flaky tests #261
Merged
amsiglan
merged 5 commits into
opensearch-project:main
from
jovancacvetkovic:feature/fix_cypress_flaky_tests
Dec 22, 2022
Merged
Fix cypress flaky tests #261
amsiglan
merged 5 commits into
opensearch-project:main
from
jovancacvetkovic:feature/fix_cypress_flaky_tests
Dec 22, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
…-analytics-dashboards-plugin into feature/fix_cypress_flaky_tests # Conflicts: # cypress/integration/2_rules.spec.js # cypress/integration/3_alerts.spec.js
Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
amsiglan
reviewed
Dec 22, 2022
amsiglan
approved these changes
Dec 22, 2022
Signed-off-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
sbcd90
approved these changes
Dec 22, 2022
The backport to
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.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-261-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b241dde95fb7bb3740cb0b398f22d7bb067db8dc
# Push it to GitHub
git push --set-upstream origin backport/backport-261-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
1 task
amsiglan
added a commit
that referenced
this pull request
Jan 9, 2023
* resolved conflicts Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * resolved conflicts Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * resolved conflicts Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * resolved conflicts Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * updated latest code from the main branch Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * updated integration test to latest from main Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> Co-authored-by: Aleksandar Djindjic <djindjic@gmail.com> Co-authored-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com>
AWSHurneyt
pushed a commit
to AWSHurneyt/security-analytics-dashboards-plugin
that referenced
this pull request
Feb 22, 2023
…opensearch-project#248, opensearch-project#261 (opensearch-project#287) * resolved conflicts Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * resolved conflicts Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * resolved conflicts Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * resolved conflicts Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * updated latest code from the main branch Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * updated integration test to latest from main Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> Co-authored-by: Aleksandar Djindjic <djindjic@gmail.com> Co-authored-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com> Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt
pushed a commit
to AWSHurneyt/security-analytics-dashboards-plugin
that referenced
this pull request
Oct 12, 2023
…opensearch-project#248, opensearch-project#261 (opensearch-project#287) * resolved conflicts Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * resolved conflicts Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * resolved conflicts Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * resolved conflicts Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * updated latest code from the main branch Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> * updated integration test to latest from main Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com> Co-authored-by: Aleksandar Djindjic <djindjic@gmail.com> Co-authored-by: Jovan Cvetkovic <jovanca.cvetkovic@gmail.com> Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Cypress test refactoring and improvements to fix flaky test execution.
Issues Resolved
#242
Check List
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.