SERVER-73998 Resolving MicroBenchmark issue with not all tasks running on certain variants

1 files changed, 55 insertions, 3 deletions

diff --git a/etc/system_perf.yml b/etc/system_perf.yml
index 5fdbd1559df..c549c4d1f3c 100755
--- a/etc/system_perf.yml
+++ b/etc/system_perf.yml
@@ -4010,7 +4010,33 @@ buildvariants:
     expansions:
       <<: *standalone-arm-expansions
       mongodb_setup: microbenchmarks_standalone-all-feature-flags.2023-01
-    tasks:
+    # Same as standalone tasks, but with compound-wildcard-index-insert added
+    tasks: &mirobenchmarks-all-feature-flags-tasks
+    - name: big_collection
+    - name: genny_scale_InsertRemove
+    - name: genny_execution_UserAcquisition
+    - name: aggregation_read_commands
+    - name: aggregation_read_commands_large_dataset
+    - name: agg-query-comparison_read_commands
+    - name: query_read_commands
+    - name: query_read_commands_large_dataset
+    - name: views-aggregation
+    - name: views-query
+    - name: where_read_commands
+    - name: update_read_commands
+    - name: insert_read_commands
+    - name: wildcard-index-read_read_commands
+    - name: wildcard-index-write_read_commands
+    - name: geo_read_commands
+    - name: misc_read_commands
+    - name: misc_custom_filter_default_read_commands
+    - name: misc_custom_filter_slow_or_sample_read_commands
+    - name: misc_custom_filter_complex_read_commands
+    - name: misc_custom_filter_whole_doc_read_commands
+    - name: misc_slowms_everything_read_commands
+    - name: singleThreaded_read_commands
+    - name: pipeline-updates
+    - name: javascript
     - name: compound-wildcard-index-insert
 
   - <<: *linux-microbenchmarks-standalone-arm
@@ -4021,6 +4047,9 @@ buildvariants:
     expansions:
       <<: *standalone-arm-expansions
       mongodb_setup: microbenchmarks_standalone-classic-query-engine.2023-01
+    # yaml does not nicely merge arrays, so DO NOT ADD INDIVIDUAL TASKS HERE.
+    # Add tasks to the anchor that this variant references
+    # If diverging from that list, add the entire list of desired tasks here
 
   - <<: *linux-microbenchmarks-standalone-arm
     name: linux-microbenchmarks-standalone-sbe-arm.2023-01
@@ -4030,6 +4059,9 @@ buildvariants:
     expansions:
       <<: *standalone-arm-expansions
       mongodb_setup: microbenchmarks_standalone-sbe.2023-01
+    # yaml does not nicely merge arrays, so DO NOT ADD INDIVIDUAL TASKS HERE.
+    # Add tasks to the anchor that this variant references
+    # If diverging from that list, add the entire list of desired tasks here
 
   - <<: *linux-microbenchmarks-repl-arm
     name: linux-microbenchmarks-repl-all-feature-flags-arm.2023-01
@@ -4038,6 +4070,9 @@ buildvariants:
     expansions:
       <<: *repl-arm-expansions
       mongodb_setup: microbenchmarks_replica-all-feature-flags.2023-01
+    # yaml does not nicely merge arrays, so DO NOT ADD INDIVIDUAL TASKS HERE.
+    # Add tasks to the anchor that this variant references
+    # If diverging from that list, add the entire list of desired tasks here
 
   - &linux-microbenchmarks-standalone-intel
     <<: *linux-microbenchmarks-standalone-arm
@@ -4051,6 +4086,9 @@ buildvariants:
     run_on:
     - "rhel70-perf-single"
     depends_on: *_compile_amazon2
+    # yaml does not nicely merge arrays, so DO NOT ADD INDIVIDUAL TASKS HERE.
+    # Add tasks to the anchor that this variant references
+    # If diverging from that list, add the entire list of desired tasks here
 
   - &linux-microbenchmarks-repl-intel
     <<: *linux-microbenchmarks-repl-arm
@@ -4064,6 +4102,9 @@ buildvariants:
     run_on:
     - "rhel70-perf-single"
     depends_on: *_compile_amazon2
+    # yaml does not nicely merge arrays, so DO NOT ADD INDIVIDUAL TASKS HERE.
+    # Add tasks to the anchor that this variant references
+    # If diverging from that list, add the entire list of desired tasks here
 
   - <<: *linux-microbenchmarks-standalone-intel
     name: linux-microbenchmarks-standalone-all-feature-flags.2023-01
@@ -4072,8 +4113,10 @@ buildvariants:
     expansions:
       <<: *standalone-intel-expansions
       mongodb_setup: microbenchmarks_standalone-all-feature-flags.2023-01
-    tasks:
-    - name: compound-wildcard-index-insert
+    tasks: *mirobenchmarks-all-feature-flags-tasks
+    # yaml does not nicely merge arrays, so DO NOT ADD INDIVIDUAL TASKS HERE.
+    # Add tasks to the anchor that this variant references
+    # If diverging from that list, add the entire list of desired tasks here
 
   - <<: *linux-microbenchmarks-standalone-intel
     name: linux-microbenchmarks-standalone-classic-query-engine.2023-01
@@ -4083,6 +4126,9 @@ buildvariants:
     expansions:
       <<: *standalone-intel-expansions
       mongodb_setup: microbenchmarks_standalone-classic-query-engine.2023-01
+    # yaml does not nicely merge arrays, so DO NOT ADD INDIVIDUAL TASKS HERE.
+    # Add tasks to the anchor that this variant references
+    # If diverging from that list, add the entire list of desired tasks here
 
   - <<: *linux-microbenchmarks-standalone-intel
     name: linux-microbenchmarks-standalone-sbe.2023-01
@@ -4092,6 +4138,9 @@ buildvariants:
     expansions:
       <<: *standalone-intel-expansions
       mongodb_setup: microbenchmarks_standalone-sbe.2023-01
+    # yaml does not nicely merge arrays, so DO NOT ADD INDIVIDUAL TASKS HERE.
+    # Add tasks to the anchor that this variant references
+    # If diverging from that list, add the entire list of desired tasks here
 
   - <<: *linux-microbenchmarks-repl-intel
     name: linux-microbenchmarks-repl-all-feature-flags.2023-01
@@ -4100,3 +4149,6 @@ buildvariants:
     expansions:
       <<: *repl-intel-expansions
       mongodb_setup: microbenchmarks_replica-all-feature-flags.2023-01
+    # yaml does not nicely merge arrays, so DO NOT ADD INDIVIDUAL TASKS HERE.
+    # Add tasks to the anchor that this variant references
+    # If diverging from that list, add the entire list of desired tasks here