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 skip version in rest-api-spec test search.highlight/30_max_analyzed_offset #12680

Conversation

saimedhi
Copy link
Contributor

@saimedhi saimedhi commented Mar 15, 2024

Description

  • Adjusted skip version for test search.highlight/30_max_analyzed_offset from ' - 2.1.99' to ' - 2.12.99' as support for the 'max_analyzed_offset' parameter with plain highlighter began in version 2.13.

  • Note: The 2.x branch already has the correct skip version for this test case.

Related Issues

#10702, opensearch-project/opensearch-py#686

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

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.

…ed_offset

Signed-off-by: saimedhi <saimedhi@amazon.com>
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change 6df69c2

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/flow-framework.git, https://github.com/opensearch-project/performance-analyzer.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/sql.git]

Copy link
Contributor

❕ Gradle check result for 6df69c2: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.remotestore.RemoteStoreIT.testPeerRecoveryWithLowActivityTimeout

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented Mar 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.49%. Comparing base (b15cb0c) to head (6df69c2).
Report is 33 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #12680      +/-   ##
============================================
+ Coverage     71.42%   71.49%   +0.07%     
- Complexity    59978    60128     +150     
============================================
  Files          4985     4989       +4     
  Lines        282275   282575     +300     
  Branches      40946    40984      +38     
============================================
+ Hits         201603   202030     +427     
+ Misses        63999    63754     -245     
- Partials      16673    16791     +118     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dblock dblock added the backport 2.x Backport to 2.x branch label Mar 15, 2024
@dblock dblock merged commit 0ad6b5e into opensearch-project:main Mar 15, 2024
64 of 115 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-12680-to-2.x.

@dblock
Copy link
Member

dblock commented Mar 15, 2024

@saimedhi can you please dig up why the version was correct on 2.x and incorrect on main? did a PR get merged to 2.x instead of going to main and then get backported?

@saimedhi
Copy link
Contributor Author

@saimedhi can you please dig up why the version was correct on 2.x and incorrect on main? did a PR get merged to 2.x instead of going to main and then get backported?

PR is fixed while backporting to 2.x

rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
ruai0511 pushed a commit to ruai0511/OpenSearch that referenced this pull request Mar 19, 2024
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…ed_offset (opensearch-project#12680)

Signed-off-by: saimedhi <saimedhi@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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