Add more flaky tests to retry logic

Signed-off-by: Prudhvi Godithi <[email protected]>

Author: prudhvigodithi

build.gradle

@@ -478,10 +478,10 @@ subprojects {
   tasks.withType(Test).configureEach {
     develocity.testRetry {
       if (BuildParams.isCi()) {
-        maxRetries = 3
-        maxFailures = 10
+        maxRetries.set(3)
+        maxFailures.set(10)
       }
-      failOnPassedAfterRetry = false
+      failOnPassedAfterRetry.set(false)
       filter {
         includeClasses.add("org.opensearch.action.admin.cluster.node.tasks.ResourceAwareTasksTests")
         includeClasses.add("org.opensearch.action.admin.cluster.tasks.PendingTasksBlocksIT")
@@ -557,6 +557,56 @@ subprojects {
         includeClasses.add("org.opensearch.test.rest.ClientYamlTestSuiteIT")
         includeClasses.add("org.opensearch.upgrade.DetectEsInstallationTaskTests")
         includeClasses.add("org.opensearch.cluster.MinimumClusterManagerNodesIT")
+        includeClasses.add("org.opensearch.indices.IndicesRequestCacheIT")
+        includeClasses.add("org.opensearch.action.admin.indices.create.RemoteCloneIndexIT")
+        includeClasses.add("org.opensearch.remotestore.RemoteStorePinnedTimestampsGarbageCollectionIT")
+        includeClasses.add("org.opensearch.remotemigration.RemoteMigrationIndexMetadataUpdateIT")
+        includeClasses.add("org.opensearch.search.approximate.ApproximatePointRangeQueryTests")
+        includeClasses.add("org.opensearch.action.admin.indices.create.RemoteSplitIndexIT")
+        includeClasses.add("org.opensearch.rest.ReactorNetty4StreamingStressIT")
+        includeClasses.add("org.opensearch.http.SearchRestCancellationIT")
+        includeClasses.add("org.opensearch.remotemigration.RemotePrimaryLocalRecoveryIT")
+        includeClasses.add("org.opensearch.cluster.service.MasterServiceTests")
+        includeClasses.add("org.opensearch.upgrades.RecoveryIT")
+        includeClasses.add("org.opensearch.upgrades.FullClusterRestartIT")
+        includeClasses.add("org.opensearch.indexing.IndexActionIT")
+        includeClasses.add("org.opensearch.indices.IndicesRequestCacheCleanupIT")
+        includeClasses.add("org.opensearch.script.expression.MoreExpressionIT")
+        includeClasses.add("org.opensearch.repositories.url.RepositoryURLClientYamlTestSuiteIT")
+        includeClasses.add("org.opensearch.join.query.ChildQuerySearchIT")
+        includeClasses.add("org.opensearch.recovery.RecoveryWhileUnderLoadIT")
+        includeClasses.add("org.opensearch.repositories.s3.S3BlobContainerRetriesTests")
+        includeClasses.add("org.opensearch.index.translog.RemoteFsTimestampAwareTranslogTests")
+        includeClasses.add("org.opensearch.search.simple.SimpleSearchIT")
+        includeClasses.add("org.opensearch.index.reindex.UpdateByQueryBasicTests")
+        includeClasses.add("org.opensearch.discovery.ClusterDisruptionIT")
+        includeClasses.add("org.opensearch.snapshots.DeleteSnapshotV2IT")
+        includeClasses.add("org.opensearch.cluster.routing.allocation.IndexShardHotSpotTests")
+        includeClasses.add("org.opensearch.upgrades.TranslogPolicyIT")
+        includeClasses.add("org.opensearch.snapshots.SharedClusterSnapshotRestoreIT")
+        includeClasses.add("org.opensearch.upgrades.UpgradeClusterClientYamlTestSuiteIT")
+        includeClasses.add("org.opensearch.cache.store.disk.EhCacheDiskCacheTests")
+        includeClasses.add("org.opensearch.backwards.PluginInfoIT")
+        includeClasses.add("org.opensearch.search.query.QueryPhaseTests")
+        includeClasses.add("org.opensearch.index.store.remote.metadata.RemoteSegmentMetadataHandlerTests")
+        includeClasses.add("org.opensearch.remotestore.RemoteStoreRestoreIT")
+        includeClasses.add("org.opensearch.qa.verify_version_constants.VerifyVersionConstantsIT")
+        includeClasses.add("org.opensearch.cluster.routing.allocation.AllocationConstraintsTest")
+        includeClasses.add("org.opensearch.common.cache.stats.DefaultCacheStatsHolderTests")
+        includeClasses.add("org.opensearch.search.aggregations.startree.RangeAggregatorTests")
+        includeClasses.add("org.opensearch.index.reindex.ReindexBasicTests")
+        includeClasses.add("org.opensearch.gateway.remote.RemoteClusterStateCleanupManagerIT")
+        includeClasses.add("org.opensearch.http.reactor.netty4.ssl.SecureReactorNetty4HttpServerTransportTests")
+        includeClasses.add("org.opensearch.cluster.decommission.DecommissionControllerTests")
+        includeClasses.add("org.opensearch.plugin.kafka.IngestFromKafkaIT")
+        includeClasses.add("org.opensearch.plugin.kinesis.IngestFromKinesisIT")
+        includeClasses.add("org.opensearch.remotemigration.ResizeIndexMigrationTestCase")
+        includeClasses.add("org.opensearch.indices.replication.SegmentReplicationResizeRequestIT")
+        includeClasses.add("org.opensearch.index.reindex.CancelTests")
+        includeClasses.add("org.opensearch.snapshots.DeleteSnapshotIT")
+        includeClasses.add("org.opensearch.search.aggregations.EquivalenceIT")
+        includeClasses.add("org.opensearch.search.aggregations.startree")
+        includeClasses.add("org.opensearch.backwards.IndexingIT")
       }
     }
   }

buildSrc/src/main/java/org/opensearch/gradle/info/GlobalBuildInfoPlugin.java

@@ -266,7 +266,7 @@ private List<JavaHome> getAvailableJavaVersions(JavaVersion minimumCompilerVersi
         return javaVersions;
     }
 
-    private static String getTestSeed() {
+    /*private static String getTestSeed() {
         String testSeedProperty = System.getProperty("tests.seed");
         final String testSeed;
         if (testSeedProperty == null) {
@@ -276,6 +276,10 @@ private static String getTestSeed() {
             testSeed = testSeedProperty;
         }
         return testSeed;
+    }*/
+
+    private static String getTestSeed() {
+        return Long.toUnsignedString(new Random(System.currentTimeMillis()).nextLong(), 16).toUpperCase(Locale.ROOT);
     }
 
     private static void throwInvalidJavaHomeException(String description, File javaHome, int expectedVersion, int actualVersion) {

gradle.properties

@@ -22,7 +22,7 @@ org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Xss2m \
 options.forkOptions.memoryMaximumSize=3g
 
 # Disable Gradle Enterprise Gradle plugin's test retry
-systemProp.develocity.testretry.enabled.enabled=false
+systemProp.develocity.testretry.enabled=false
 
 # Disable duplicate project id detection
 # See https://docs.gradle.org/current/userguide/upgrading_version_6.html#duplicate_project_names_may_cause_publication_to_fail

settings.gradle

@@ -10,7 +10,7 @@
  */
 
 plugins {
-  id "com.gradle.develocity" version "3.19.1"
+  id "com.gradle.develocity" version "4.0"
 }
 
 ext.disableBuildCache = hasProperty('DISABLE_BUILD_CACHE') || System.getenv().containsKey('DISABLE_BUILD_CACHE')