SERVER-65995 reduce perf.yml and system_perf.yml batchtime to 1 week

2 files changed, 36 insertions, 30 deletions

diff --git a/etc/perf.yml b/etc/perf.yml
index ee6c8a5b73a..8fa5c3ff408 100644
--- a/etc/perf.yml
+++ b/etc/perf.yml
@@ -49,6 +49,9 @@ variables:
     - benchmarks
     - py-tpcc
 
+  _batch_times:
+    - &batchtime_one_week 10080
+
 modules:
   ###
   # Same in every DSI project. Ensure that this block is synchronized with
@@ -918,7 +921,7 @@ tasks:
 buildvariants:
   - name: linux-wt-standalone
     display_name: Standalone Linux inMemory
-    batchtime: 240  # 4 hours
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       # We are explicitly tracking the rhel62 variant compile options from evergreen.yml for
@@ -981,7 +984,7 @@ buildvariants:
 
   - name: linux-wt-repl
     display_name: 1-Node ReplSet Linux inMemory
-    batchtime: 240  # 4 hours
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongod_exec_wrapper: *exec_wrapper
diff --git a/etc/system_perf.yml b/etc/system_perf.yml
index 225fe678ec0..1adeb96a038 100755
--- a/etc/system_perf.yml
+++ b/etc/system_perf.yml
@@ -60,6 +60,9 @@ variables:
     - benchmarks
     - py-tpcc
 
+  _batch_times:
+  - &batchtime_one_week 10080
+
 
 modules:
   ###
@@ -906,7 +909,7 @@ buildvariants:
     name: compile-amazon2
     display_name: Compile
     modules: *modules
-    batchtime: 2880 # 48 hours
+    batchtime: *batchtime_one_week
     expansions: &compile-expansions
       platform: linux
       project_dir: &project_dir dsi
@@ -927,7 +930,7 @@ buildvariants:
 
   - name: linux-standalone
     display_name: Linux Standalone
-    batchtime: 2880  # 48 hours
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: standalone
@@ -962,7 +965,7 @@ buildvariants:
   - name: compile-rhel70
     display_name: Compile for Atlas-like
     modules: *modules
-    batchtime: 2880 # 48 hours
+    batchtime: *batchtime_one_week
     expansions:
       <<: *compile-expansions
       compile_flags: >-
@@ -980,7 +983,7 @@ buildvariants:
 
   - name: linux-1-node-replSet
     display_name: Linux 1-Node ReplSet
-    batchtime: 10080 # 7 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: single-replica
@@ -1025,7 +1028,7 @@ buildvariants:
 
   - name: linux-standalone-audit
     display_name: Linux Standalone Audit
-    batchtime: 10080 # 7 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: standalone-audit
@@ -1046,7 +1049,7 @@ buildvariants:
 
   - name: linux-1-node-replSet-fle
     display_name: Linux 1-Node ReplSet FLE
-    batchtime: 5760  # 4 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: single-replica-fle
@@ -1067,7 +1070,7 @@ buildvariants:
 
   - name: linux-1-node-replSet-cwrwc
     display_name: Linux 1-Node ReplSet CWRWC
-    batchtime: 5760  # 4 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: single-replica-cwrwc
@@ -1087,7 +1090,7 @@ buildvariants:
 
   - name: linux-1-node-replSet-ese-cbc
     display_name: Linux 1-Node ReplSet ESE CBC
-    batchtime: 5760  # 4 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: single-replica-ese-cbc
@@ -1108,7 +1111,7 @@ buildvariants:
 
   - name: linux-1-node-replSet-ese-gcm
     display_name: Linux 1-Node ReplSet ESE GCM
-    batchtime: 5760  # 4 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: single-replica-ese-gcm
@@ -1129,7 +1132,7 @@ buildvariants:
 
   - name: linux-1-node-15gbwtcache
     display_name: Linux 1-Node ReplSet 15 GB WiredTiger Cache
-    batchtime: 2880  # 48 hours
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: single-replica-15gbwtcache
@@ -1149,7 +1152,7 @@ buildvariants:
 
   - name: linux-3-node-1dayhistory-15gbwtcache
     display_name: Linux 3-Node ReplSet 1 Day History 15 GB WiredTiger Cache
-    batchtime: 5760  # 4 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: replica-1dayhistory-15gbwtcache
@@ -1170,7 +1173,7 @@ buildvariants:
 
   - name: linux-3-shard
     display_name: Linux 3-Shard Cluster
-    batchtime: 10080 # 7 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: shard
@@ -1201,7 +1204,7 @@ buildvariants:
 
   - name: linux-shard-lite-audit
     display_name: Linux Shard Lite Cluster Audit
-    batchtime: 5760  # 4 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: shard-lite-audit
@@ -1218,7 +1221,7 @@ buildvariants:
 
   - name: linux-shard-lite
     display_name: Linux Shard Lite Cluster
-    batchtime: 5760  # 4 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: shard-lite
@@ -1256,7 +1259,7 @@ buildvariants:
 
   - name: linux-shard-lite-cwrwc
     display_name: Linux Shard Lite Cluster CWRWC
-    batchtime: 10080 # 7 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: shard-lite-cwrwc
@@ -1276,7 +1279,7 @@ buildvariants:
 
   - name: linux-shard-single
     display_name: Linux Shard Single
-    batchtime: 5760  # 4 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: shard-single
@@ -1294,7 +1297,7 @@ buildvariants:
 
   - name: linux-3-node-replSet
     display_name: Linux 3-Node ReplSet
-    batchtime: 2880  # 48 hours
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: replica
@@ -1344,7 +1347,7 @@ buildvariants:
 
   - name: linux-3-node-replSet-last-continuous-fcv
     display_name: Linux 3-Node ReplSet (Last Continuous FCV)
-    batchtime: 10080 # 7 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: replica-last-continuous-fcv
@@ -1395,7 +1398,7 @@ buildvariants:
 
   - name: linux-3-node-replSet-last-lts-fcv
     display_name: Linux 3-Node ReplSet (Last LTS FCV)
-    batchtime: 10080  # 7 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: replica-last-lts-fcv
@@ -1447,7 +1450,7 @@ buildvariants:
 
   - name: linux-3-node-replSet-noflowcontrol
     display_name: Linux 3-Node ReplSet (Flow Control off)
-    batchtime: 10080  # 7 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: replica-noflowcontrol
@@ -1478,7 +1481,7 @@ buildvariants:
 
   - name: linux-3-node-replSet-ssl
     display_name: Linux 3-Node ReplSet (SSL)
-    batchtime: 10080 # 7 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: replica-ssl
@@ -1498,7 +1501,7 @@ buildvariants:
 
   - name: linux-3-node-replSet-maintenance-events
     display_name: Linux 3-Node ReplSet (Maintenance Events)
-    batchtime: 5760  # 4 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: replica-maintenance-events
@@ -1526,7 +1529,7 @@ buildvariants:
 
   - name: linux-3-node-replSet-initialsync
     display_name: Linux 3-Node ReplSet Initial Sync
-    batchtime: 2880  # 48 hours
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: replica-2node
@@ -1547,7 +1550,7 @@ buildvariants:
 
   - name: linux-replSet-initialsync-logkeeper
     display_name: Linux ReplSet Initial Sync LogKeeper
-    batchtime: 10080 # 7 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: initialsync-logkeeper
@@ -1570,7 +1573,7 @@ buildvariants:
   # patch builds.
   #- name: linux-replSet-initialsync-logkeeper-snapshot-update
   #  display_name: Linux ReplSet Initial Sync LogKeeper Snapshot Update
-  #  batchtime: 10080 # 7 days
+  #  batchtime: *batchtime_one_week
   #  modules: *modules
   #  expansions:
   #    mongodb_setup: initialsync-logkeeper
@@ -1592,7 +1595,7 @@ buildvariants:
 
   - name: linux-replSet-audit
     display_name: Linux 3-Node ReplSet Audit
-    batchtime: 10080 # 7 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: replica-audit
@@ -1611,7 +1614,7 @@ buildvariants:
 
   - name: linux-replSet-auth-delay
     display_name: Linux 3-Node ReplSet (Auth Delay)
-    batchtime: 10080 # 7 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: replica-auth-cluster-delay
@@ -1629,7 +1632,7 @@ buildvariants:
 
   - name: atlas-like-M60
     display_name: M60-Like 3-Node ReplSet
-    batchtime: 5760  # 4 days
+    batchtime: *batchtime_one_week
     modules: *modules
     expansions:
       mongodb_setup: atlas-like-replica