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

Remove 1.0.0 for BWC test #492

Merged
merged 1 commit into from
Aug 4, 2022
Merged

Remove 1.0.0 for BWC test #492

merged 1 commit into from
Aug 4, 2022

Conversation

junqiu-lei
Copy link
Member

@junqiu-lei junqiu-lei commented Aug 4, 2022

Signed-off-by: Junqiu Lei junqiu@amazon.com

Description

Remove 1.0.0 BWC and switch to version 1.1.0, related issue opensearch-project/OpenSearch#3001

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as 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.

Signed-off-by: Junqiu Lei <junqiu@amazon.com>
@junqiu-lei junqiu-lei added Infrastructure Changes to infrastructure, testing, CI/CD, pipelines, etc. backport 2.x labels Aug 4, 2022
@junqiu-lei junqiu-lei requested a review from a team August 4, 2022 16:59
@junqiu-lei junqiu-lei self-assigned this Aug 4, 2022
@@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
java: [ 11, 17 ]
bwc_version : [ "1.0.0", "1.1.0", "1.2.4", "1.3.2", "2.0.0", "2.1.0" ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why aren't we bumping to 1.0.1 instead of just removing 1.0.0?

Copy link
Member

@martin-gaievski martin-gaievski Aug 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the request from infra team is to use 1.1.0 as a lowest version, removing makes sense.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fix that commit after 1.0.0 did not go into 1.0.1 release because 1.0.1 bundle is using 1.0.0 core + 1.0.0.0/1.0.1.0 plugins as a mix.

@codecov-commenter
Copy link

Codecov Report

Merging #492 (9bac1fd) into main (206f7e1) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main     #492   +/-   ##
=========================================
  Coverage     84.04%   84.04%           
  Complexity     1019     1019           
=========================================
  Files           146      146           
  Lines          4188     4188           
  Branches        373      373           
=========================================
  Hits           3520     3520           
  Misses          492      492           
  Partials        176      176           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@junqiu-lei junqiu-lei merged commit 57c5496 into opensearch-project:main Aug 4, 2022
@opensearch-trigger-bot
Copy link
Contributor

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

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 4, 2022
Signed-off-by: Junqiu Lei <junqiu@amazon.com>
(cherry picked from commit 57c5496)
junqiu-lei added a commit that referenced this pull request Aug 4, 2022
Signed-off-by: Junqiu Lei <junqiu@amazon.com>
(cherry picked from commit 57c5496)

Co-authored-by: Junqiu Lei <junqiu@amazon.com>
@heemin32 heemin32 added v2.2.0 and removed 2.2.0 labels Nov 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x backport 2.x Infrastructure Changes to infrastructure, testing, CI/CD, pipelines, etc. v2.2.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants