-
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
[Backport 2.x] Gradle Check Optimization #13787
Conversation
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>
❌ Gradle check result for cddb3cf: ABORTED Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
❌ Gradle check result for cddb3cf: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
❌ Gradle check result for cddb3cf: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
❌ Gradle check result for cddb3cf: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
The gradle check failure here is expected as the new field |
Second to this, as the code is using pull_request_target event so all the workflow files changes are coming from the current merged 2.x branch head commit, not from fork. Thanks. |
@peternied can we go ahead and merge this? |
Think we need someone from @opensearch-project/admin to help merge as maintainers are not able to override checks anymore. |
Thanks @jed326 I will take care of it. |
@prudhvigodithi @jed326 - It looks like the gradle check wasn't handling the case where the data was missing gracefully. This seems like a miss in the jenkins library change. Most importantly - Is merging code unblocked in other pull requests targeting 2.x / 1.x branches? Do they need to rebase/merge from main? For follow up can we update the jenkins library to catch and handle these issues better?
|
Hey @peternied, yes open PR's still needs to rebased. The ideal way was to 1st merge all the gradle change backport PR's from core repo and then the Jenkinsfile change (PR: opensearch-project/opensearch-build#4719) that handles the new fields, then it would not throw the error as |
@prudhvigodithi Could you comment on all opens PRs that need to rebase so those authors know how to get the check to pass again / avoid troubleshooting that failure? |
Sure, before that let me see if using |
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.14 2.14
# Navigate to the new working tree
pushd ../.worktrees/backport-2.14
# Create a new branch
git switch --create backport/backport-13787-to-2.14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 03c13cbec0f553d47e24739806f010095481fea5
# Push it to GitHub
git push --set-upstream origin backport/backport-13787-to-2.14
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.14 Then, create a pull request where the |
2 similar comments
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.14 2.14
# Navigate to the new working tree
pushd ../.worktrees/backport-2.14
# Create a new branch
git switch --create backport/backport-13787-to-2.14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 03c13cbec0f553d47e24739806f010095481fea5
# Push it to GitHub
git push --set-upstream origin backport/backport-13787-to-2.14
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.14 Then, create a pull request where the |
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.14 2.14
# Navigate to the new working tree
pushd ../.worktrees/backport-2.14
# Create a new branch
git switch --create backport/backport-13787-to-2.14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 03c13cbec0f553d47e24739806f010095481fea5
# Push it to GitHub
git push --set-upstream origin backport/backport-13787-to-2.14
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/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>
…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>
Backport 5441d55 from #13786.