From ecd06ac47b9ac9f8c3d2ccc8fa2924d3a19acd8e Mon Sep 17 00:00:00 2001 From: Bogdan Mukvich Date: Fri, 11 Aug 2023 17:47:39 +0200 Subject: [PATCH] [Build] Fix usage of `--scan` parameter with test retry Gradle fails to configure test retry when `--scan` parameter is present It happens due to some race in plugin application and creation of a test extension ^KTI-1339 --- .../buildsrc-compat/src/main/kotlin/testRetry.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/testRetry.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/testRetry.kt index 090c04a2ef2..00739af4ed0 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/testRetry.kt +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/testRetry.kt @@ -13,11 +13,13 @@ fun Project.configureTestRetriesForTestTasks() { ?.toString()?.toInt() ?: (if (kotlinBuildProperties.isTeamcityBuild) 3 else 0) - tasks.withType().configureEach { - retry { - maxRetries.set(testRetryMaxRetries) - maxFailures.set(20) - failOnPassedAfterRetry.set(false) + pluginManager.withPlugin("gradle-enterprise") { + tasks.withType().configureEach { + retry { + maxRetries.set(testRetryMaxRetries) + maxFailures.set(20) + failOnPassedAfterRetry.set(false) + } } } }