SERVER-65995 reduce evergreen.yml batchtime to 1 week except for !RHEL8

1 files changed, 41 insertions, 37 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index d3ea9004974..e926cfbe3f0 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -82,6 +82,10 @@ parameters:
 ## Some variables for convenience:
 variables:
 
+- &batchtime_one_day 1440
+- &batchtime_one_week 10080
+- &batchtime_one_year 525600
+
 # Used when the tests it runs depend only on mongod, mongos, the mongo shell and the tools.
 - &task_template
   name: template
@@ -7103,7 +7107,7 @@ buildvariants:
 - &linux-64-debug-required-template
   name: linux-64-debug-required
   display_name: "! Shared Library Linux DEBUG"
-  batchtime: 1440 # 1 days
+  batchtime: *batchtime_one_week
   run_on:
   - rhel80-medium
   expansions:
@@ -7332,7 +7336,7 @@ buildvariants:
   display_name: TLA+
   run_on:
   - ubuntu1804-build
-  batchtime: 10080 # 7 days
+  batchtime: *batchtime_one_week
   stepback: false
   expansions:
     timeout_secs: 345600 # 4 days
@@ -7984,7 +7988,7 @@ buildvariants:
 
 - name: windows-debug-suggested
   display_name: "* Windows DEBUG"
-  batchtime: 1440 # 1 days
+  batchtime: *batchtime_one_week
   run_on:
   - windows-vsCurrent-small
   expansions:
@@ -8053,7 +8057,7 @@ buildvariants:
 - &enterprise-windows-required-template
   name: enterprise-windows-required
   display_name: "! Enterprise Windows"
-  batchtime: 1440 # 1 days
+  batchtime: *batchtime_one_week
   modules:
   - enterprise
   run_on:
@@ -8100,7 +8104,7 @@ buildvariants:
 - &enterprise-windows-suggested-template
   name: enterprise-windows-suggested
   display_name: "* Enterprise Windows"
-  batchtime: 1440 # 1 days
+  batchtime: *batchtime_one_week
   modules:
     - enterprise
   run_on:
@@ -8436,7 +8440,7 @@ buildvariants:
 - &macos-debug-template
   name: macos-debug-suggested
   display_name: "* Shared Library macOS DEBUG"
-  batchtime: 1440 # 1 days
+  batchtime: *batchtime_one_week
   run_on:
   - macos-1014
   expansions: &macos-debug-expansions
@@ -8534,7 +8538,7 @@ buildvariants:
   display_name: "Embedded SDK - macOS"
   run_on:
   - macos-1014
-  batchtime: 10080 # 7 days
+  batchtime: *batchtime_one_week
   expansions:
     test_flags: --excludeWithAnyTags=uses_transactions,incompatible_with_macos
     cmake_path: /Applications/cmake-3.11.0-Darwin-x86_64/CMake.app/Contents/bin/cmake
@@ -8584,7 +8588,7 @@ buildvariants:
 
 - name: enterprise-rhel-80-64-bit
   display_name: "Enterprise RHEL 8.0"
-  batchtime: 2880 # 2 days
+  batchtime: *batchtime_one_week
   modules:
   - enterprise
   run_on:
@@ -8696,7 +8700,7 @@ buildvariants:
 - &enterprise-rhel-80-64-bit-dynamic-required-template
   name: enterprise-rhel-80-64-bit-dynamic-required
   display_name: "! Shared Library Enterprise RHEL 8.0"
-  batchtime: 1440 # 1 day
+  batchtime: *batchtime_one_day
   modules:
   - enterprise
   run_on:
@@ -8821,7 +8825,7 @@ buildvariants:
 - &enterprise-rhel-80-64-bit-dynamic-backport-feature-flags-required-template
   name: enterprise-rhel-80-64-bit-dynamic-backport-feature-flags-required
   display_name: "! Shared Library Enterprise RHEL 8.0 (Backport Feature Flags)"
-  batchtime: 1440 # 1 day
+  batchtime: *batchtime_one_week
   modules:
     - enterprise
   run_on:
@@ -8911,7 +8915,7 @@ buildvariants:
   - enterprise
   run_on:
   - rhel80-small
-  batchtime: 10080 # 7 days
+  batchtime: *batchtime_one_week
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
     compile_flags: >-
@@ -9016,7 +9020,7 @@ buildvariants:
   - enterprise
   run_on:
   - rhel80-small
-  batchtime: 2880 # 2 days
+  batchtime: *batchtime_one_week
   expansions: &enterprise-rhel-80-64-bit-lock-free-reads-expansions
     test_flags: >-
       --mongodSetParameters="{featureFlagLockFreeReads: false}" --excludeWithAnyTags=incompatible_with_lockfreereads
@@ -9107,7 +9111,7 @@ buildvariants:
   display_name: "RHEL 8.0 Shared Library (No SSL)"
   run_on:
   - rhel80-small
-  batchtime: 2880 # 2 days
+  batchtime: *batchtime_one_week
   expansions:
     compile_flags: >-
       -j$(grep -c ^processor /proc/cpuinfo)
@@ -9133,7 +9137,7 @@ buildvariants:
     - enterprise
   run_on:
     - rhel80-medium
-  batchtime: 10080 # 7 days
+  batchtime: *batchtime_one_week
   stepback: false
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
@@ -9197,7 +9201,7 @@ buildvariants:
 # are spending when we split tasks into multiple sub-tasks.
 - name: enterprise-rhel-80-64-bit-single-task-baseline
   display_name: "Enterprise RHEL 8.0 (Single Task Baseline)"
-  batchtime: 10080  # 1 week.
+  batchtime: *batchtime_one_week
   modules:
     - enterprise
   run_on:
@@ -9332,7 +9336,7 @@ buildvariants:
 - &enterprise-rhel-80-64-bit-suggested-template
   name: enterprise-rhel-80-64-bit-suggested
   display_name: "* Enterprise RHEL 8.0"
-  batchtime: 1440 # 1 days
+  batchtime: *batchtime_one_week
   modules:
   - enterprise
   run_on:
@@ -9449,7 +9453,7 @@ buildvariants:
 - <<: *enterprise-rhel-70-64-bit-template
   name: enterprise-rhel-70-64-bit-kitchen-sink
   display_name: "~ Enterprise RHEL 7.0"
-  batchtime: 2880 # 2 days
+  batchtime: *batchtime_one_week
   expansions:
     <<: *enterprise-rhel-70-64-bit-expansions-template
     compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars
@@ -9462,7 +9466,7 @@ buildvariants:
 - <<: *enterprise-rhel-70-64-bit-template
   name: hot_backups-rhel-70-64-bit
   display_name: "hot_backups RHEL 7.0"
-  batchtime: 2880 # 2 days
+  batchtime: *batchtime_one_week
   run_on:
   - rhel70
   expansions:
@@ -9479,7 +9483,7 @@ buildvariants:
 - <<: *enterprise-rhel-70-64-bit-template
   name: enterprise-rhel-70-64-bit-no-libunwind
   display_name: "~ Enterprise RHEL 7.0 (no-libunwind)"
-  batchtime: 10080  # 1 week
+  batchtime: *batchtime_one_week
   run_on:
   - rhel70
   expansions:
@@ -9519,7 +9523,7 @@ buildvariants:
 
 - name: ubuntu1804-debug-suggested
   display_name: "* Shared Library Ubuntu 18.04 DEBUG"
-  batchtime: 1440 # 1 days
+  batchtime: *batchtime_one_week
   run_on:
   - ubuntu1804-test
   expansions:
@@ -9749,7 +9753,7 @@ buildvariants:
   - enterprise
   run_on:
   - rhel81-power8-small
-  batchtime: 10080 # 7 days
+  batchtime: *batchtime_one_week
   stepback: false
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
@@ -9802,7 +9806,7 @@ buildvariants:
   - enterprise
   run_on:
   - rhel72-zseries-test
-  batchtime: 10080 # 7 days
+  batchtime: *batchtime_one_week
   stepback: false
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
@@ -9833,7 +9837,7 @@ buildvariants:
   - enterprise
   run_on:
   - rhel72-zseries-test
-  batchtime: 525600 # 365 days
+  batchtime: *batchtime_one_year
   stepback: false
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
@@ -9886,7 +9890,7 @@ buildvariants:
   - enterprise
   run_on:
   - rhel83-zseries-small
-  batchtime: 525600 # 365 days
+  batchtime: *batchtime_one_year
   stepback: false
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
@@ -9939,7 +9943,7 @@ buildvariants:
 
 - name: enterprise-ubuntu-dynamic-1804-clang-tidy-required
   display_name: "! Enterprise Clang Tidy"
-  batchtime: 1440 # 1 days
+  batchtime: *batchtime_one_week
   modules:
   - enterprise
   run_on:
@@ -10589,7 +10593,7 @@ buildvariants:
   - enterprise
   run_on:
   - rhel72-zseries-test
-  batchtime: 525600 # 365 days
+  batchtime: *batchtime_one_year
   stepback: false
   expansions:
     additional_package_targets: archive-mongocryptd archive-mongocryptd-debug
@@ -10792,7 +10796,7 @@ buildvariants:
 - &ubuntu1804-debug-aubsan-lite-required-template
   name: ubuntu1804-debug-aubsan-lite-required
   display_name: "! Shared Library {A,UB}SAN Enterprise Ubuntu 18.04 DEBUG"
-  batchtime: 1440 # 1 days
+  batchtime: *batchtime_one_week
   modules:
   - enterprise
   run_on:
@@ -10885,7 +10889,7 @@ buildvariants:
 
 - name: enterprise-ubuntu-unoptimized-1804-64-bit
   display_name: "~ Enterprise Ubuntu 18.04 (without Diagnostic Latches)"
-  batchtime: 2880 # 2 days
+  batchtime: *batchtime_one_week
   modules:
   - enterprise
   expansions:
@@ -10909,7 +10913,7 @@ buildvariants:
 
 - name: enterprise-ubuntu-fixed-service-executor-1804-64-bit
   display_name: "~ Enterprise Ubuntu 18.04 (with FixedServiceExecutor)"
-  batchtime: 2880 # 2 days
+  batchtime: *batchtime_one_week
   run_on:
     - ubuntu1804-test
   modules:
@@ -10942,7 +10946,7 @@ buildvariants:
 
 - name: enterprise-ubuntu-sdam-replica-set-monitor-1804-64-bit
   display_name: "~ Enterprise Ubuntu 18.04 (with SdamReplicaSetMonitor)"
-  batchtime: 2880 # 2 days
+  batchtime: *batchtime_one_week
   run_on:
     - ubuntu1804-test
   modules:
@@ -10974,7 +10978,7 @@ buildvariants:
 
 - name: enterprise-ubuntu-task-executor-pool-size-1804-64-bit
   display_name: "~ Enterprise Ubuntu 18.04 (with {taskExecutorPoolSize: 4})"
-  batchtime: 2880 # 2 days
+  batchtime: *batchtime_one_week
   run_on:
     - ubuntu1804-test
   modules:
@@ -11004,7 +11008,7 @@ buildvariants:
 
 - name: enterprise-ubuntu-sharding-task-executor-pool-rsm-matchPrimary-1804-64-bit
   display_name: "~ Enterprise Ubuntu 18.04 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"matchPrimaryNode\"})"
-  batchtime: 2880 # 2 days
+  batchtime: *batchtime_one_week
   run_on:
     - ubuntu1804-test
   modules:
@@ -11035,7 +11039,7 @@ buildvariants:
 
 - name: enterprise-ubuntu-sharding-task-executor-pool-rsm-matchBusiest-1804-64-bit
   display_name: "~ Enterprise Ubuntu 18.04 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"matchBusiestNode\"})"
-  batchtime: 2880 # 2 days
+  batchtime: *batchtime_one_week
   run_on:
     - ubuntu1804-test
   modules:
@@ -11066,7 +11070,7 @@ buildvariants:
 
 - name: enterprise-ubuntu-sharding-task-executor-pool-rsm-disabled-1804-64-bit
   display_name: "~ Enterprise Ubuntu 18.04 (with {ShardingTaskExecutorPoolReplicaSetMatching: \"disabled\"})"
-  batchtime: 2880 # 2 days
+  batchtime: *batchtime_one_week
   run_on:
     - ubuntu1804-test
   modules:
@@ -11119,7 +11123,7 @@ buildvariants:
     - enterprise
   run_on:
     - rhel80-small
-  batchtime: 10080 # 7 days
+  batchtime: *batchtime_one_week
   stepback: false
   expansions:
     selected_tests_buildvariants: enterprise-windows-required linux-64-debug-required enterprise-ubuntu-dynamic-1604-clang ubuntu1804-debug-aubsan-lite-required
@@ -11132,7 +11136,7 @@ buildvariants:
   - enterprise
   run_on:
     - rhel80-small
-  batchtime: 10080 # 7 days
+  batchtime: *batchtime_one_week
   stepback: false
   tasks:
   - name: validate_commit_message
@@ -11140,7 +11144,7 @@ buildvariants:
 
 - name: live-record
   display_name: "~ RHEL 8.0 Shared Library (with UndoDB live-record)"
-  batchtime: 2880 # 2 days
+  batchtime: *batchtime_one_week
   stepback: false
   modules:
   - enterprise