-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Gradle Check Optimization #13786
Gradle Check Optimization #13786
Conversation
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #13786 +/- ##
============================================
+ Coverage 71.42% 71.73% +0.31%
- Complexity 59978 61325 +1347
============================================
Files 4985 5062 +77
Lines 282275 287907 +5632
Branches 40946 41692 +746
============================================
+ Hits 201603 206530 +4927
- Misses 63999 64316 +317
- Partials 16673 17061 +388 ☔ View full report in Codecov by Sentry. |
Tagging @cwperks @peternied @dblock @andrross @peterzhuamazon to please take a look. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me - any concerns before merging?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@peternied not able to get this Pull Request Checks pass, can you please check ? |
Seems like the logs on that check spell it out, no?
|
Yes I see that but they dont even exist in my PR description, I guess I have to re-add them back with |
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> (cherry picked from commit 5441d55) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
The backport to
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-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-1.x
# Create a new branch
git switch --create backport/backport-13786-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5441d55ee191ca789ba86b7e477a64eb73398c80
# Push it to GitHub
git push --set-upstream origin backport/backport-13786-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-1.x Then, create a pull request where the |
@prudhvigodithi FYI looks like you'll need to manually fix some conflicts if you want to backport this to 1.x |
The backport to
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-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-1.3
# Create a new branch
git switch --create backport/backport-13786-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5441d55ee191ca789ba86b7e477a64eb73398c80
# Push it to GitHub
git push --set-upstream origin backport/backport-13786-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-1.3 Then, create a pull request where the |
Ya @andrross it should be backported to 1.3 (failed as well, which I will do it manually) as 1.x is reaching EOL and active supported version is 1.3.x, please correct me if I'm wrong. |
(cherry picked from commit 5441d55) Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Works as expected, here is the gradle check invoked with |
@prudhvigodithi Yes, you're right! No need to backport 1.x. 1.3 is the only active branch in the 1.x line. |
The backport to
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.14 2.14
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.14
# Create a new branch
git switch --create backport/backport-13786-to-2.14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5441d55ee191ca789ba86b7e477a64eb73398c80
# Push it to GitHub
git push --set-upstream origin backport/backport-13786-to-2.14
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.14 Then, create a pull request where the |
1 similar comment
The backport to
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.14 2.14
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.14
# Create a new branch
git switch --create backport/backport-13786-to-2.14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5441d55ee191ca789ba86b7e477a64eb73398c80
# Push it to GitHub
git push --set-upstream origin backport/backport-13786-to-2.14
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.14 Then, create a pull request where the |
…ect#13787) (cherry picked from commit 5441d55) Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> (cherry picked from commit 03c13cb)
(cherry picked from commit 5441d55) Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> (cherry picked from commit 03c13cb) Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
…ect#13787) (cherry picked from commit 5441d55) Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Signed-off-by: kkewwei <kkewwei@163.com>
Description
Coming from #11217 (comment), this PR will ensure we have the PR number identified by commitID even for
post_merge_action
. This data will be used in gradle metrics dashboard OpenSearch Gradle Check Metrics.The required jenkinsfile change PR opensearch-project/opensearch-build#4719.
The required library change PR opensearch-project/opensearch-build-libraries#427.
With this change we can get the associated PR for failed tests on
post_merge_action
.Related Issues
Part of: #3713
Testing
Here is the sample workflow run for
push
action https://github.com/prudhvigodithi/opensearch-build/actions/runs/9163727535/job/25193476071, where the PR number (prudhvigodithi/opensearch-build#110) is displayed forpush
event.Check List
New functionality has been documented.New functionality has javadoc addedAPI changes companion pull request created.Commit changes are listed out in CHANGELOG.md file (See: Changelog)Public documentation issue/PR createdBy 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.