Merge pull request gradle#25920 Add test retry plugin for GE plugin v…

…ersions supporting safe mode Co-authored-by: Iurii Ignatko <[email protected]>
dongbinghua · Jul 28, 2023 · c8ca699 · c8ca699
2 parents 72387fd + a81441f
commit c8ca699
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AbstractSmokeTest.groovy b/subprojects/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/AbstractSmokeTest.groovy
@@ -96,6 +96,7 @@ abstract class AbstractSmokeTest extends Specification {
 
         // https://developer.android.com/studio/releases/build-tools
         static androidTools = "34.0.0"
+
         // https://developer.android.com/studio/releases/gradle-plugin
         static androidGradle = Versions.of(*AGP_VERSIONS.latestsPlusNightly)
 
@@ -186,13 +187,13 @@ abstract class AbstractSmokeTest extends Specification {
         static palantirConsistentVersions = "2.12.0"
 
         // https://github.com/etiennestuder/teamcity-build-scan-plugin/releases
-        static teamCityGradlePluginRef = "v0.33"
+        static teamCityGradlePluginRef = "v0.35"
 
         // https://github.com/jenkinsci/gradle-plugin/releases
-        static jenkinsGradlePluginRef = "gradle-2.8.1"
+        static jenkinsGradlePluginRef = "gradle-2.8.2"
 
         // https://github.com/gradle/gradle-enterprise-bamboo-plugin/releases
-        static bambooGradlePluginRef = "gradle-enterprise-bamboo-plugin-1.1.0"
+        static bambooGradlePluginRef = "gradle-enterprise-bamboo-plugin-1.1.2"
     }
 
     static class Versions implements Iterable<String> {

diff --git a/...cts/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/BuildScanPluginSmokeTest.groovy b/...cts/smoke-test/src/smokeTest/groovy/org/gradle/smoketests/BuildScanPluginSmokeTest.groovy
@@ -18,6 +18,7 @@ package org.gradle.smoketests
 
 import org.gradle.internal.enterprise.core.GradleEnterprisePluginManager
 import org.gradle.plugin.management.internal.autoapply.AutoAppliedGradleEnterprisePlugin
+import org.gradle.test.fixtures.file.TestFile
 import org.gradle.test.precondition.Requires
 import org.gradle.test.preconditions.IntegTestPreconditions
 import org.gradle.testkit.runner.BuildResult
@@ -147,6 +148,8 @@ class BuildScanPluginSmokeTest extends AbstractSmokeTest {
     private static final VersionNumber FIRST_VERSION_SUPPORTING_GRADLE_8_CONFIGURATION_CACHE = VersionNumber.parse("3.12")
     private static final VersionNumber FIRST_VERSION_SUPPORTING_ISOLATED_PROJECTS = VersionNumber.parse("3.15")
     private static final VersionNumber FIRST_VERSION_CALLING_BUILD_PATH = VersionNumber.parse("3.13.1")
+    private static final VersionNumber FIRST_VERSION_BUNDLING_TEST_RETRY_PLUGIN = VersionNumber.parse("3.12")
+    private static final VersionNumber FIRST_VERSION_SUPPORTING_SAFE_MODE = VersionNumber.parse("3.15")
 
     private static final List<String> SUPPORTED_WITH_GRADLE_8_CONFIGURATION_CACHE = SUPPORTED
         .findAll { FIRST_VERSION_SUPPORTING_GRADLE_8_CONFIGURATION_CACHE <= VersionNumber.parse(it) }
@@ -287,6 +290,16 @@ class BuildScanPluginSmokeTest extends AbstractSmokeTest {
         """.stripIndent()
 
         setupJavaProject()
+        if (doesNotBundleTestRetryPluginOrSupportsSafeMode(versionNumber)) {
+            new TestFile(buildFile).with {
+                touch()
+                prepend("""
+                    plugins {
+                        id "org.gradle.test-retry" version "${TestedVersions.testRetryPlugin}"
+                    }
+                """)
+            }
+        }
 
         expect:
         scanRunner("--init-script", initScript)
@@ -308,6 +321,10 @@ class BuildScanPluginSmokeTest extends AbstractSmokeTest {
         ciScriptVersion = ci.gitRef
     }
 
+    private boolean doesNotBundleTestRetryPluginOrSupportsSafeMode(VersionNumber pluginVersion) {
+        pluginVersion < FIRST_VERSION_BUNDLING_TEST_RETRY_PLUGIN || pluginVersion >= FIRST_VERSION_SUPPORTING_SAFE_MODE
+    }
+
     BuildResult build(String... args) {
         scanRunner(args).build()
     }