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

Update gradle config for develocity rebranding #13942

Merged
merged 1 commit into from
Jun 3, 2024

Conversation

andrross
Copy link
Member

@andrross andrross commented Jun 3, 2024

The Gradle Enterprise plugin has been rebranded as the Develocity Plugin, resulting in a number of settings being deprecated. This commit updates the settings per this migration guide and removes all warnings from the build.

The following warnings are no longer present after this change:

WARNING: The following functionality has been deprecated and will be removed in the next major release of the Develocity Gradle plugin. Run with '-Ddevelocity.deprecation.captureOrigin=true' to see where the deprecated functionality is being used. For assistance with migration, see https://gradle.com/help/gradle-plugin-develocity-migration.
- The deprecated "gradle.enterprise.testretry.enabled" system property has been replaced by "develocity.testretry.enabled"
- The "com.gradle.enterprise" plugin has been replaced by "com.gradle.develocity"

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • API changes companion pull request created.
  • 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.

@reta reta added the backport 2.x Backport to 2.x branch label Jun 3, 2024
Copy link
Contributor

github-actions bot commented Jun 3, 2024

❌ Gradle check result for 939cab8: 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?

@andrross
Copy link
Member Author

andrross commented Jun 3, 2024

❌ Gradle check result for 939cab8: 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?

#13600

The Gradle Enterprise plugin has been rebranded as the Develocity
Plugin, resulting in a number of settings being deprecated. This commit
updates the settings per [this migration guide][1] and removes all
warnings from the build.

[1]: https://docs.gradle.com/develocity/gradle-plugin/legacy/#develocity_migration

Signed-off-by: Andrew Ross <andrross@amazon.com>
@andrross andrross force-pushed the change-test-retry-setting branch from 939cab8 to c870568 Compare June 3, 2024 20:49
Copy link
Contributor

github-actions bot commented Jun 3, 2024

❕ Gradle check result for c870568: UNSTABLE

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 Jun 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.73%. Comparing base (b15cb0c) to head (c870568).
Report is 339 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #13942      +/-   ##
============================================
+ Coverage     71.42%   71.73%   +0.31%     
- Complexity    59978    61395    +1417     
============================================
  Files          4985     5066      +81     
  Lines        282275   288247    +5972     
  Branches      40946    41743     +797     
============================================
+ Hits         201603   206769    +5166     
- Misses        63999    64418     +419     
- Partials      16673    17060     +387     

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

@reta
Copy link
Collaborator

reta commented Jun 3, 2024

@peterzhuamazon @gaiksaya @prudhvigodithi its seems like some checks are in "stuck" mode, nothing could be merged, could you help folks by checking the repo settings? Thank you.

@prudhvigodithi
Copy link
Member

@peterzhuamazon @gaiksaya @prudhvigodithi its seems like some checks are in "stuck" mode, nothing could be merged, could you help folks by checking the repo settings? Thank you.

@reta let me check

@gaiksaya
Copy link
Member

gaiksaya commented Jun 3, 2024

@peterzhuamazon @gaiksaya @prudhvigodithi its seems like some checks are in "stuck" mode, nothing could be merged, could you help folks by checking the repo settings? Thank you.

@reta Authors need to rebase. The new workflow was added a week back so anything that was raised before that would need rebase and re-run

@reta
Copy link
Collaborator

reta commented Jun 3, 2024

@reta Authors need to rebase. The new workflow was added a week back so anything that was raised before that would need rebase and re-run

@gaiksaya those are brand new pull requests created a few hours ago

@prudhvigodithi
Copy link
Member

Looks like this PR is blocked for DCO Expected — Waiting for status to be reported.

@reta
Copy link
Collaborator

reta commented Jun 3, 2024

Looks like this PR is blocked for DCO Expected — Waiting for status to be reported.

Correct, and there are a number of pull requests "stuck" there, afaik DCO is an app, not workflow ...

@prudhvigodithi
Copy link
Member

Correct, and there are a number of pull requests "stuck" there, afaik DCO is an app, not workflow ...

True but in past the app used to take care of running as a workflow for every PR, looks to me like something changed with it.

@prudhvigodithi
Copy link
Member

Same is the case for other repos I dont see DCO running for new PR's opensearch-project/opensearch-build-libraries#434, but in past it used to https://github.com/opensearch-project/opensearch-build-libraries/pull/427/checks.
To unblock I will remove the DCO as PR requirement for OpenSearch repo until its resolved.

@reta reta merged commit e3d7e99 into opensearch-project:main Jun 3, 2024
30 checks passed
@reta
Copy link
Collaborator

reta commented Jun 3, 2024

To unblock I will remove the DCO as PR requirement for OpenSearch repo until its resolved.

Thank you @prudhvigodithi

@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-13942-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e3d7e9988b643173babe0fbb82a31fe6c6c1eb86
# Push it to GitHub
git push --set-upstream origin backport/backport-13942-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-13942-to-2.x.

@reta
Copy link
Collaborator

reta commented Jun 3, 2024

@andrross could you please backport to 2.x? Thank you.

andrross added a commit to andrross/OpenSearch that referenced this pull request Jun 3, 2024
)

The Gradle Enterprise plugin has been rebranded as the Develocity
Plugin, resulting in a number of settings being deprecated. This commit
updates the settings per [this migration guide][1] and removes all
warnings from the build.

[1]: https://docs.gradle.com/develocity/gradle-plugin/legacy/#develocity_migration

Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit e3d7e99)
@andrross andrross deleted the change-test-retry-setting branch June 3, 2024 23:36
@prudhvigodithi
Copy link
Member

prudhvigodithi commented Jun 3, 2024

There was a new issue created in dcoapp/app with the same issue as we got above.

andrross added a commit to andrross/OpenSearch that referenced this pull request Jun 4, 2024
)

The Gradle Enterprise plugin has been rebranded as the Develocity
Plugin, resulting in a number of settings being deprecated. This commit
updates the settings per [this migration guide][1] and removes all
warnings from the build.

[1]: https://docs.gradle.com/develocity/gradle-plugin/legacy/#develocity_migration

Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit e3d7e99)
kotwanikunal pushed a commit that referenced this pull request Jun 4, 2024
The Gradle Enterprise plugin has been rebranded as the Develocity
Plugin, resulting in a number of settings being deprecated. This commit
updates the settings per [this migration guide][1] and removes all
warnings from the build.

[1]: https://docs.gradle.com/develocity/gradle-plugin/legacy/#develocity_migration

Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit e3d7e99)
akolarkunnu pushed a commit to akolarkunnu/OpenSearch that referenced this pull request Jun 5, 2024
)

The Gradle Enterprise plugin has been rebranded as the Develocity
Plugin, resulting in a number of settings being deprecated. This commit
updates the settings per [this migration guide][1] and removes all
warnings from the build.

[1]: https://docs.gradle.com/develocity/gradle-plugin/legacy/#develocity_migration

Signed-off-by: Andrew Ross <andrross@amazon.com>
LantaoJin pushed a commit to LantaoJin/OpenSearch that referenced this pull request Jun 6, 2024
)

The Gradle Enterprise plugin has been rebranded as the Develocity
Plugin, resulting in a number of settings being deprecated. This commit
updates the settings per [this migration guide][1] and removes all
warnings from the build.

[1]: https://docs.gradle.com/develocity/gradle-plugin/legacy/#develocity_migration

Signed-off-by: Andrew Ross <andrross@amazon.com>
parv0201 pushed a commit to parv0201/OpenSearch that referenced this pull request Jun 10, 2024
)

The Gradle Enterprise plugin has been rebranded as the Develocity
Plugin, resulting in a number of settings being deprecated. This commit
updates the settings per [this migration guide][1] and removes all
warnings from the build.

[1]: https://docs.gradle.com/develocity/gradle-plugin/legacy/#develocity_migration

Signed-off-by: Andrew Ross <andrross@amazon.com>
kkewwei pushed a commit to kkewwei/OpenSearch that referenced this pull request Jul 24, 2024
) (opensearch-project#13958)

The Gradle Enterprise plugin has been rebranded as the Develocity
Plugin, resulting in a number of settings being deprecated. This commit
updates the settings per [this migration guide][1] and removes all
warnings from the build.

[1]: https://docs.gradle.com/develocity/gradle-plugin/legacy/#develocity_migration

Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit e3d7e99)
Signed-off-by: kkewwei <kkewwei@163.com>
wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
)

The Gradle Enterprise plugin has been rebranded as the Develocity
Plugin, resulting in a number of settings being deprecated. This commit
updates the settings per [this migration guide][1] and removes all
warnings from the build.

[1]: https://docs.gradle.com/develocity/gradle-plugin/legacy/#develocity_migration

Signed-off-by: Andrew Ross <andrross@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.

6 participants