SERVER-21891: perf.yml dependency fix

(cherry picked from commit c9ab09110a65f8373e033234c3529a3e90a54dd5)

1 files changed, 30 insertions, 31 deletions

diff --git a/etc/perf.yml b/etc/perf.yml
index e389c154f9d..a9227a452eb 100644
--- a/etc/perf.yml
+++ b/etc/perf.yml
@@ -58,7 +58,7 @@ functions:
       params:
         working_dir: src
         script: |
-          set -e 
+          set -e
           set -v
           chmod +x mongod
           chmod +x mongo
@@ -70,7 +70,7 @@ functions:
         background: true
         working_dir: src
         script: |
-          set -e 
+          set -e
           set -o verbose
           mkdir -p ./dbdata
           ${mongod_exec_wrapper} ./mongod --dbpath ./dbdata ${mongod_flags}
@@ -213,7 +213,7 @@ tasks:
     - func: "run perf tests"
       vars:
         includeFilter1: "query"
-        includeFilter2 : "core regression" 
+        includeFilter2 : "core regression"
         excludeFilter : "single_threaded"
         threads : "1 2 4 8"
     - func: "download analysis scripts"
@@ -227,7 +227,7 @@ tasks:
     - func: "run perf tests"
       vars:
         includeFilter1: "where"
-        includeFilter2 : "core regression" 
+        includeFilter2 : "core regression"
         excludeFilter : "single_threaded"
         threads : "1 2 4 8"
     - func: "download analysis scripts"
@@ -241,7 +241,7 @@ tasks:
     - func: "run perf tests"
       vars:
         includeFilter1: "update"
-        includeFilter2 : "core regression" 
+        includeFilter2 : "core regression"
         excludeFilter : "single_threaded"
         threads : "1 2 4 8"
     - func: "download analysis scripts"
@@ -255,7 +255,7 @@ tasks:
     - func: "run perf tests"
       vars:
         includeFilter1: "insert"
-        includeFilter2 : "core regression" 
+        includeFilter2 : "core regression"
         excludeFilter : "single_threaded"
         threads : "1 2 4 8"
     - func: "download analysis scripts"
@@ -269,7 +269,7 @@ tasks:
     - func: "run perf tests"
       vars:
         includeFilter1: "geo"
-        includeFilter2 : "core regression" 
+        includeFilter2 : "core regression"
         excludeFilter : "single_threaded"
         threads : "1 2 4 8"
     - func: "download analysis scripts"
@@ -283,7 +283,7 @@ tasks:
     - func: "run perf tests"
       vars:
         includeFilter1: "command multi remove mixed"
-        includeFilter2 : "core regression" 
+        includeFilter2 : "core regression"
         excludeFilter : "single_threaded"
         threads : "1 2 4 8"
     - func: "download analysis scripts"
@@ -297,7 +297,7 @@ tasks:
     - func: "run perf tests"
       vars:
         includeFilter1: "single_threaded"
-        includeFilter2 : "core regression" 
+        includeFilter2 : "core regression"
         excludeFilter : "none"
         threads : "1"
     - func: "download analysis scripts"
@@ -337,7 +337,7 @@ tasks:
         compare_task : "insert"
         variant1 : "linux-wt-standalone"
         variant2 : "linux-wt-repl"
-    - func: "analyze"        
+    - func: "analyze"
 - name: update-wt-repl-comp
   depends_on:
     - name : compile
@@ -355,7 +355,7 @@ tasks:
         compare_task : "update"
         variant1 : "linux-wt-standalone"
         variant2 : "linux-wt-repl"
-    - func: "analyze"        
+    - func: "analyze"
 - name: misc-wt-repl-comp
   depends_on:
     - name : compile
@@ -373,7 +373,7 @@ tasks:
         compare_task : "misc"
         variant1 : "linux-wt-standalone"
         variant2 : "linux-wt-repl"
-    - func: "analyze"        
+    - func: "analyze"
 - name: singleThreaded-wt-mmap-standalone-comp
   depends_on:
     - name : compile
@@ -391,7 +391,7 @@ tasks:
         compare_task : "singleThreaded"
         variant2 : "linux-wt-standalone"
         variant1 : "linux-mmap-standalone"
-    - func: "analyze"        
+    - func: "analyze"
 - name: query-wt-mmap-standalone-comp
   depends_on:
     - name : compile
@@ -409,7 +409,7 @@ tasks:
         compare_task : "query"
         variant2 : "linux-wt-standalone"
         variant1 : "linux-mmap-standalone"
-    - func: "analyze"        
+    - func: "analyze"
 - name: where-wt-mmap-standalone-comp
   depends_on:
     - name : compile
@@ -427,7 +427,7 @@ tasks:
         compare_task : "where"
         variant2 : "linux-wt-standalone"
         variant1 : "linux-mmap-standalone"
-    - func: "analyze"        
+    - func: "analyze"
 - name: geo-wt-mmap-standalone-comp
   depends_on:
     - name : compile
@@ -445,7 +445,7 @@ tasks:
         compare_task : "geo"
         variant2 : "linux-wt-standalone"
         variant1 : "linux-mmap-standalone"
-    - func: "analyze"        
+    - func: "analyze"
 - name: insert-wt-mmap-standalone-comp
   depends_on:
     - name : compile
@@ -463,7 +463,7 @@ tasks:
         compare_task : "insert"
         variant2 : "linux-wt-standalone"
         variant1 : "linux-mmap-standalone"
-    - func: "analyze"        
+    - func: "analyze"
 - name: update-wt-mmap-standalone-comp
   depends_on:
     - name : compile
@@ -481,7 +481,7 @@ tasks:
         compare_task : "update"
         variant2 : "linux-wt-standalone"
         variant1 : "linux-mmap-standalone"
-    - func: "analyze"        
+    - func: "analyze"
 - name: misc-wt-mmap-standalone-comp
   depends_on:
     - name : compile
@@ -499,7 +499,7 @@ tasks:
         compare_task : "misc"
         variant2 : "linux-wt-standalone"
         variant1 : "linux-mmap-standalone"
-    - func: "analyze"        
+    - func: "analyze"
 - name: singleThreaded-wt-mmap-repl-comp
   depends_on:
     - name : compile
@@ -517,7 +517,7 @@ tasks:
         compare_task : "singleThreaded"
         variant2 : "linux-wt-repl"
         variant1 : "linux-mmap-repl"
-    - func: "analyze"        
+    - func: "analyze"
 - name: insert-wt-mmap-repl-comp
   depends_on:
     - name : compile
@@ -535,7 +535,7 @@ tasks:
         compare_task : "insert"
         variant2 : "linux-wt-repl"
         variant1 : "linux-mmap-repl"
-    - func: "analyze"        
+    - func: "analyze"
 - name: update-wt-mmap-repl-comp
   depends_on:
     - name : compile
@@ -553,14 +553,14 @@ tasks:
         compare_task : "update"
         variant2 : "linux-wt-repl"
         variant1 : "linux-mmap-repl"
-    - func: "analyze"        
+    - func: "analyze"
 - name: misc-wt-mmap-repl-comp
   depends_on:
     - name : compile
       variant : linux-wt-standalone
-      status : "*"
     - name : misc
       variant : linux-wt-repl
+      status : "*"
     - name : misc
       variant :  linux-mmap-repl
       status : "*"
@@ -571,7 +571,7 @@ tasks:
         compare_task : "misc"
         variant2 : "linux-wt-repl"
         variant1 : "linux-mmap-repl"
-    - func: "analyze"        
+    - func: "analyze"
 - name: singleThreaded-mmap-repl-comp
   depends_on:
     - name : compile
@@ -589,7 +589,7 @@ tasks:
         compare_task : "singleThreaded"
         variant1 : "linux-mmap-standalone"
         variant2 : "linux-mmap-repl"
-    - func: "analyze"        
+    - func: "analyze"
 - name: insert-mmap-repl-comp
   depends_on:
     - name : compile
@@ -607,7 +607,7 @@ tasks:
         compare_task : "insert"
         variant1 : "linux-mmap-standalone"
         variant2 : "linux-mmap-repl"
-    - func: "analyze"        
+    - func: "analyze"
 - name: update-mmap-repl-comp
   depends_on:
     - name : compile
@@ -625,7 +625,7 @@ tasks:
         compare_task : "update"
         variant1 : "linux-mmap-standalone"
         variant2 : "linux-mmap-repl"
-    - func: "analyze"        
+    - func: "analyze"
 - name: misc-mmap-repl-comp
   depends_on:
     - name : compile
@@ -643,7 +643,7 @@ tasks:
         compare_task : "misc"
         variant1 : "linux-mmap-standalone"
         variant2 : "linux-mmap-repl"
-    - func: "analyze"        
+    - func: "analyze"
 
 buildvariants:
 - name: linux-wt-standalone
@@ -693,7 +693,7 @@ buildvariants:
   display_name: 1-Node ReplSet Linux WT
   batchtime: 360 # 6 hours
   expansions:
-    compile_flags: *compile_flags 
+    compile_flags: *compile_flags
     mongod_exec_wrapper: *exec_wrapper
     perf_exec_wrapper: *perf_wrapper
     mongod_flags: "--replSet=test --storageEngine=wiredTiger --logpath ./mongod.log --fork --syncdelay 0 --nojournal --setParameter ttlMonitorEnabled=false --wiredTigerCacheSizeGB 16 --oplogSize 100000 --setParameter diagnosticDataCollectionEnabled=false "
@@ -710,7 +710,7 @@ buildvariants:
   display_name: 1-Node ReplSet Linux MMAPv1
   batchtime: 360 # 6 hours
   expansions:
-    compile_flags: *compile_flags 
+    compile_flags: *compile_flags
     mongod_exec_wrapper: *exec_wrapper
     perf_exec_wrapper: *perf_wrapper
     mongod_flags: "--replSet=test --storageEngine=mmapv1 --logpath ./mongod.log --fork --syncdelay 0 --nojournal --setParameter ttlMonitorEnabled=false --oplogSize 100000 --setParameter diagnosticDataCollectionEnabled=false"
@@ -773,4 +773,3 @@ buildvariants:
   - name: insert-wt-mmap-repl-comp
   - name: update-wt-mmap-repl-comp
   - name: misc-wt-mmap-repl-comp
-