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

Staging for version increment automation #442

Merged
merged 4 commits into from
Jul 26, 2022

Conversation

prudhvigodithi
Copy link
Contributor

@prudhvigodithi prudhvigodithi commented Jul 12, 2022

Description

This is the staging PR for to execute workflows that auto raise the version increment PR's
Example: prudhvigodithi#1

Issues Resolved

Part of: opensearch-project/opensearch-build#1375
From solution: opensearch-project/opensearch-build#1375 (comment)
Related issue: #433

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.

@prudhvigodithi prudhvigodithi requested a review from a team July 12, 2022 21:56
@prudhvigodithi prudhvigodithi added backport 1.x backport 2.0 auto backport label backport 2.1 Backports PRs to 2.1 branch labels Jul 12, 2022
@prudhvigodithi
Copy link
Contributor Author

Renaming task to updateVersion following opensearch-project/opensearch-plugin-template-java#32

@prudhvigodithi
Copy link
Contributor Author

Renaming to task updateVersion following opensearch-project/opensearch-plugin-template-java#32.

jmazanec15
jmazanec15 previously approved these changes Jul 26, 2022
@jmazanec15
Copy link
Member

@prudhvigodithi One other place that version needs to be updated: https:/opensearch-project/k-NN/blob/main/.github/workflows/backwards_compatibility_tests_workflow.yml#L18, https:/opensearch-project/k-NN/blob/main/.github/workflows/backwards_compatibility_tests_workflow.yml#L50.

Can it be added here as well?

@prudhvigodithi
Copy link
Contributor Author

prudhvigodithi commented Jul 26, 2022

Hey @jmazanec15 I have included .github/workflows/backwards_compatibility_tests_workflow.yml and tested executing the task
./gradlew updateVersion -DnewVersion=2.2.0-SNAPSHOT

diff --git a/.github/workflows/backwards_compatibility_tests_workflow.yml b/.github/workflows/backwards_compatibility_tests_workflow.yml
index ce654ee..5f4d01c 100644
--- a/.github/workflows/backwards_compatibility_tests_workflow.yml
+++ b/.github/workflows/backwards_compatibility_tests_workflow.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         java: [ 11, 17 ]
         bwc_version : [ "1.0.0", "1.1.0", "1.2.4", "1.3.2", "2.0.0" ]
-        opensearch_version : [ "2.1.0-SNAPSHOT" ]
+        opensearch_version : [ "2.2.0-SNAPSHOT" ]
 
     name: k-NN Restart-Upgrade BWC Tests
     runs-on: ubuntu-latest
@@ -47,7 +47,7 @@ jobs:
       matrix:
         java: [ 11, 17 ]
         bwc_version: [ "1.3.2", "2.0.0" ]
-        opensearch_version: [ "2.1.0-SNAPSHOT" ]
+        opensearch_version: [ "2.2.0-SNAPSHOT" ]

@bbarani

@codecov-commenter
Copy link

codecov-commenter commented Jul 26, 2022

Codecov Report

Merging #442 (422e2f7) into main (7af37c8) will increase coverage by 0.07%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main     #442      +/-   ##
============================================
+ Coverage     84.02%   84.09%   +0.07%     
- Complexity      911      979      +68     
============================================
  Files           130      140      +10     
  Lines          3880     4031     +151     
  Branches        359      362       +3     
============================================
+ Hits           3260     3390     +130     
- Misses          458      475      +17     
- Partials        162      166       +4     
Impacted Files Coverage Δ
...main/java/org/opensearch/knn/indices/ModelDao.java 81.73% <0.00%> (-1.91%) ⬇️
...ava/org/opensearch/knn/index/KNNMethodContext.java 92.50% <0.00%> (-0.76%) ⬇️
...g/opensearch/knn/index/MethodComponentContext.java 91.13% <0.00%> (-0.63%) ⬇️
...index/codec/KNN80Codec/KNN80DocValuesConsumer.java 88.67% <0.00%> (-0.42%) ⬇️
...java/org/opensearch/knn/index/MethodComponent.java 88.88% <0.00%> (-0.25%) ⬇️
...rch/knn/plugin/transport/TrainingModelRequest.java 83.50% <0.00%> (-0.20%) ⬇️
.../main/java/org/opensearch/knn/index/IndexUtil.java 55.73% <0.00%> (ø)
.../main/java/org/opensearch/knn/index/KNNMethod.java 100.00% <0.00%> (ø)
...main/java/org/opensearch/knn/plugin/KNNPlugin.java 100.00% <0.00%> (ø)
...n/java/org/opensearch/knn/index/KNNIndexShard.java 93.75% <0.00%> (ø)
... and 20 more

Help us with your feedback. Take ten seconds to tell us how you rate us.

@bbarani
Copy link
Member

bbarani commented Jul 26, 2022

@vamshin can you please review this PR soon?

@jmazanec15 jmazanec15 merged commit 4869fe9 into opensearch-project:main Jul 26, 2022
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.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-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-442-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4869fe97c154f48f2f88dbf254ef943630f9c6b6
# Push it to GitHub
git push --set-upstream origin backport/backport-442-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 base branch is 2.x and the compare/head branch is backport/backport-442-to-2.x.

jmazanec15 pushed a commit to jmazanec15/k-NN-1 that referenced this pull request Jul 28, 2022
jmazanec15 pushed a commit to jmazanec15/k-NN-1 that referenced this pull request Jul 28, 2022
Signed-off-by: pgodithi <[email protected]>
(cherry picked from commit 4869fe9)
Signed-off-by: John Mazanec <[email protected]>
jmazanec15 pushed a commit to jmazanec15/k-NN-1 that referenced this pull request Jul 28, 2022
Signed-off-by: pgodithi <[email protected]>
(cherry picked from commit 4869fe9)
Signed-off-by: John Mazanec <[email protected]>
jmazanec15 pushed a commit to jmazanec15/k-NN-1 that referenced this pull request Jul 28, 2022
Signed-off-by: pgodithi <[email protected]>
(cherry picked from commit 4869fe9)
Signed-off-by: John Mazanec <[email protected]>
@junqiu-lei junqiu-lei added 2.2.0 Infrastructure Changes to infrastructure, testing, CI/CD, pipelines, etc. labels Aug 2, 2022
@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 2.x backport 2.0 auto backport label backport 2.1 Backports PRs to 2.1 branch 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.

8 participants