Skip to content

Commit 3a7d8fa

Browse files
authored
Use test-retry plugin in place of develocity (#17976)
To fix the deprecation warnings in #13942 I believe I should have just removed the gradle enterprise plugin all together as I think it is unused. This commit goes back to using the open-source test-retry Gradle plugin and removes develocity. This should not change the functionality of the test retry logic in any way. Signed-off-by: Andrew Ross <[email protected]>
1 parent f7da8c3 commit 3a7d8fa

File tree

3 files changed

+3
-15
lines changed

3 files changed

+3
-15
lines changed

build.gradle

+3-8
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ plugins {
5555
id 'opensearch.docker-support'
5656
id 'opensearch.global-build-info'
5757
id "com.diffplug.spotless" version "6.25.0" apply false
58+
id "org.gradle.test-retry" version "1.6.2" apply false
5859
id "test-report-aggregation"
5960
id 'jacoco-report-aggregation'
6061
}
@@ -70,13 +71,6 @@ apply from: 'gradle/run.gradle'
7071
apply from: 'gradle/missing-javadoc.gradle'
7172
apply from: 'gradle/code-coverage.gradle'
7273

73-
// Disable unconditional publishing of build scans
74-
develocity {
75-
buildScan {
76-
publishing.onlyIf { false }
77-
}
78-
}
79-
8074
// common maven publishing configuration
8175
allprojects {
8276
group = 'org.opensearch'
@@ -475,8 +469,9 @@ gradle.projectsEvaluated {
475469

476470
// test retry configuration
477471
subprojects {
472+
apply plugin: "org.gradle.test-retry"
478473
tasks.withType(Test).configureEach {
479-
develocity.testRetry {
474+
retry {
480475
if (BuildParams.isCi()) {
481476
maxRetries = 3
482477
maxFailures = 10

gradle.properties

-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Xss2m \
2121
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
2222
options.forkOptions.memoryMaximumSize=3g
2323

24-
# Disable Gradle Enterprise Gradle plugin's test retry
25-
systemProp.develocity.testretry.enabled.enabled=false
26-
2724
# Disable duplicate project id detection
2825
# See https://docs.gradle.org/current/userguide/upgrading_version_6.html#duplicate_project_names_may_cause_publication_to_fail
2926
systemProp.org.gradle.dependency.duplicate.project.detection=false

settings.gradle

-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
* GitHub history for details.
1010
*/
1111

12-
plugins {
13-
id "com.gradle.develocity" version "3.19.1"
14-
}
15-
1612
ext.disableBuildCache = hasProperty('DISABLE_BUILD_CACHE') || System.getenv().containsKey('DISABLE_BUILD_CACHE')
1713

1814
buildCache {

0 commit comments

Comments
 (0)