SERVER-39284: Handle generated task timeouts with repeated suites

1 files changed, 103 insertions, 21 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index d2f87cb0669..49b0e1e8afb 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -5977,6 +5977,18 @@ tasks:
       resmoke_args: --suites=parallel --storageEngine=wiredTiger
       resmoke_jobs_max: 1
 
+- name: parallel_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: parallel
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 1
+      resmoke_jobs_max: 1
+
 - <<: *task_template
   name: parallel_compatibility
   depends_on:
@@ -6706,6 +6718,17 @@ tasks:
     vars:
       resmoke_args: --suites=logical_session_cache_sharding_default_refresh_jscore_passthrough --storageEngine=wiredTiger
 
+- name: logical_session_cache_sharding_default_refresh_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: logical_session_cache_sharding_default_refresh_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 1
+
 - <<: *task_template
   name: logical_session_cache_sharding_100ms_refresh_jscore_passthrough
   depends_on:
@@ -6716,6 +6739,17 @@ tasks:
     vars:
       resmoke_args: --suites=logical_session_cache_sharding_100ms_refresh_jscore_passthrough --storageEngine=wiredTiger
 
+- name: logical_session_cache_sharding_100ms_refresh_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: logical_session_cache_sharding_100ms_refresh_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 1
+
 - <<: *task_template
   name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
   depends_on:
@@ -6747,6 +6781,17 @@ tasks:
     vars:
       resmoke_args: --suites=logical_session_cache_sharding_10sec_refresh_jscore_passthrough --storageEngine=wiredTiger
 
+- name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: logical_session_cache_sharding_10sec_refresh_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 1
+
 - <<: *task_template
   name: logical_session_cache_standalone_default_refresh_jscore_passthrough
   depends_on:
@@ -6757,6 +6802,17 @@ tasks:
     vars:
       resmoke_args: --suites=logical_session_cache_standalone_default_refresh_jscore_passthrough --storageEngine=wiredTiger
 
+- name: logical_session_cache_standalone_default_refresh_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: logical_session_cache_standalone_default_refresh_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 1
+
 - <<: *task_template
   name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough
   depends_on:
@@ -6767,6 +6823,17 @@ tasks:
     vars:
       resmoke_args: --suites=logical_session_cache_standalone_100ms_refresh_jscore_passthrough --storageEngine=wiredTiger
 
+- name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: logical_session_cache_standalone_100ms_refresh_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 1
+
 - <<: *task_template
   name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
   depends_on:
@@ -6798,6 +6865,17 @@ tasks:
     vars:
       resmoke_args: --suites=logical_session_cache_standalone_10sec_refresh_jscore_passthrough --storageEngine=wiredTiger
 
+- name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough_gen
+  depends_on:
+  - name: jsCore
+  commands:
+  - func: "generate resmoke tasks"
+    vars:
+      task: logical_session_cache_standalone_10sec_refresh_jscore_passthrough
+      depends_on: jsCore
+      resmoke_args: --storageEngine=wiredTiger
+      fallback_num_sub_suites: 1
+
 - <<: *task_template
   name: retryable_writes_jscore_stepdown_passthrough
   depends_on:
@@ -7701,6 +7779,10 @@ buildvariants:
       --excludeWithAnyTags=requires_http_client
       --repeatSuites=10
       --shuffle
+    resmoke_repeat_suites: 10
+    # TODO: There are currently 2 ways of repeating suites, one for regular suites and one for
+    # generated suites. Once everything is converted to generated suites, we should remove the
+    # '--repeatSuites=10' from the test_flags. This will be done in SERVER-38817.
     scons_cache_scope: shared
     tooltags: ""
     build_mongoreplay: true
@@ -7716,19 +7798,19 @@ buildvariants:
   - name: integration_tests_sharded
   - name: jsCore
   - name: jsCore_txns
-  - name: logical_session_cache_replication_100ms_refresh_jscore_passthrough
-  - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough
-  - name: logical_session_cache_replication_10sec_refresh_jscore_passthrough
-  - name: logical_session_cache_replication_default_refresh_jscore_passthrough
-  - name: logical_session_cache_sharding_100ms_refresh_jscore_passthrough
-  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough
-  - name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough
-  - name: logical_session_cache_sharding_default_refresh_jscore_passthrough
-  - name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough
-  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough
-  - name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough
-  - name: logical_session_cache_standalone_default_refresh_jscore_passthrough
-  - name: parallel
+  - name: logical_session_cache_replication_100ms_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_replication_1sec_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_replication_10sec_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_replication_default_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_sharding_100ms_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_sharding_1sec_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_sharding_10sec_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_sharding_default_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_standalone_100ms_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_standalone_1sec_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_standalone_10sec_refresh_jscore_passthrough_gen
+  - name: logical_session_cache_standalone_default_refresh_jscore_passthrough_gen
+  - name: parallel_gen
   - name: concurrency
   - name: concurrency_replication
     distros:
@@ -7743,17 +7825,17 @@ buildvariants:
     distros:
     - rhel62-large
   #- name: concurrency_sharded_replication_local_read_write_multi_stmt_txn # Removed until SERVER-38499 is resolved.
-    distros:
-    - rhel62-large
+  #  distros:
+  #  - rhel62-large
   #- name: concurrency_sharded_replication_local_read_write_multi_stmt_txn_with_balancer # Removed until SERVER-38499 is resolved.
-    distros:
-    - rhel62-large
+  #  distros:
+  #  - rhel62-large
   #- name: concurrency_sharded_replication_multi_stmt_txn # Removed until SERVER-38499 is resolved.
-    distros:
-    - rhel62-large
+  #  distros:
+  #  - rhel62-large
   #- name: concurrency_sharded_replication_multi_stmt_txn_with_balancer # Removed until SERVER-38499 is resolved.
-    distros:
-    - rhel62-large
+  #  distros:
+  #  - rhel62-large
   - name: concurrency_sharded_replication_with_balancer
     distros:
     - rhel62-large