SERVER-42575 compiling and running unittests should be a single task

2 files changed, 21 insertions, 222 deletions

diff --git a/buildscripts/evergreen_task_tags.py b/buildscripts/evergreen_task_tags.py
index 01ca1809152..7941f93f565 100755
--- a/buildscripts/evergreen_task_tags.py
+++ b/buildscripts/evergreen_task_tags.py
@@ -24,6 +24,8 @@ def parse_command_line():
     parser.add_argument("--list-tags", action="store_true", default=False,
                         help="List all tags used by tasks in evergreen yml.")
     parser.add_argument("--list-tasks", type=str, help="List all tasks for the given buildvariant.")
+    parser.add_argument("--list-variants-and-tasks", action="store_true",
+                        help="List all tasks for every buildvariant.")
     parser.add_argument("-t", "--tasks-for-tag", type=str, default=None, action="append",
                         help="List all tasks that use the given tag.")
     parser.add_argument("-x", "--remove-tasks-for-tag-filter", type=str, default=None,
@@ -78,6 +80,18 @@ def list_all_tasks(evg_config, build_variant):
         print(task)
 
 
+def list_all_variants_and_tasks(evg_config):
+    """
+    Print all tasks for every build variant.
+
+    :param evg_config: Evergreen configuration.
+    """
+    for variant in evg_config.variant_names:
+        tasks = get_all_tasks(evg_config, variant)
+        for task in tasks:
+            print("%s | %s" % (variant, task))
+
+
 def is_task_tagged(task, tags, filters):
     """
     Determine if given task match tag query.
@@ -128,6 +142,9 @@ def main():
     if options.list_tags:
         list_all_tags(evg_config)
 
+    if options.list_variants_and_tasks:
+        list_all_variants_and_tasks(evg_config)
+
     if options.list_tasks:
         list_all_tasks(evg_config, options.list_tasks)
 
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 053602ecb09..e41af4d6b72 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -196,24 +196,12 @@ variables:
   - benchrun_embedded_update
   - generate_benchrun_embedded_files
 
-- &unittests
-  name: unittests!
-  execution_tasks:
-  - compile_unittests
-  - unittests
-
 - &libfuzzertests
   name: libfuzzertests!
   execution_tasks:
   - compile_libfuzzertests
   - libfuzzertests
 
-- &dbtest
-  name: dbtest!
-  execution_tasks:
-  - compile_dbtest
-  - dbtest
-
 - &compile_task_group_template
   name: compile_task_group_template
   max_hosts: 1
@@ -287,9 +275,6 @@ variables:
   - windows-64-vs2017-test
   modules:
   - enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   expansions: &enterprise-windows-64-2k8-nopush-expansions-template
     platform_decompress: unzip
     exe: ".exe"
@@ -3821,18 +3806,14 @@ tasks:
         display_name: Library Dependency Graph (library_dependency_graph.json)
         build_variants: [enterprise-rhel-70-64-bit-kitchen-sink] # This must be the Dagger variant
 
-## compile_unittests - build unittests ##
-- name: compile_unittests
+## unittests - run unittests ##
+- name: unittests
   commands:
     - func: "scons compile"
       vars:
         targets: unittests
         task_compile_flags: >-
           --detect-odr-violations
-
-## unittests - run unittests ##
-- name: unittests
-  commands:
     - func: "run diskstats"
     - func: "monitor process threads"
     - func: "collect system resource info"
@@ -3858,15 +3839,14 @@ tasks:
       vars:
         resmoke_args: --suites=libfuzzer
 
-## compile_dbtest ##
-- name: compile_dbtest
+## dbtest ##
+- name: dbtest
   commands:
     - func: "scons compile"
       vars:
         targets: dbtest
         task_compile_flags: >-
           --detect-odr-violations
-
     # Tar unstripped dbtest, to be archived in case of failure
     - command: archive.targz_pack
       params:
@@ -3874,10 +3854,6 @@ tasks:
         source_dir: "src"
         include:
           - "./dbtest*"
-
-## dbtest ##
-- name: dbtest
-  commands:
     - func: "run diskstats"
     - func: "monitor process threads"
     - func: "collect system resource info"
@@ -8335,7 +8311,6 @@ task_groups:
 - <<: *compile_task_group_template
   name: dbtest_TG
   tasks:
-  - compile_dbtest
   - dbtest
 - <<: *compile_task_group_template
   name: libfuzzertests_TG
@@ -8359,9 +8334,7 @@ task_groups:
   name: compile_all_run_unittests_TG
   tasks:
   - compile
-  - compile_unittests
   - unittests
-  - compile_dbtest
   - dbtest
   - compile_all
 - name: embedded_sdk_build_and_test
@@ -8448,9 +8421,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: ""
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8486,9 +8456,6 @@ buildvariants:
     tooltags: ""
     build_mongoreplay: true
     target_resmoke_time: 15
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: .aggregation !.encrypt
@@ -8550,9 +8517,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: ""
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8583,9 +8547,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: ""
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8613,9 +8574,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8670,9 +8628,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8718,9 +8673,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8789,9 +8741,6 @@ buildvariants:
     multiversion_architecture: arm64
     multiversion_architecture_42_or_later: aarch64
     multiversion_edition: enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: .aggfuzzer .common
@@ -8841,9 +8790,6 @@ buildvariants:
     multiversion_architecture: arm64
     multiversion_architecture_42_or_later: aarch64
     multiversion_edition: enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
@@ -8891,9 +8837,6 @@ buildvariants:
     multiversion_architecture: arm64
     multiversion_architecture_42_or_later: aarch64
     multiversion_edition: targeted
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: free_monitoring
@@ -8928,9 +8871,6 @@ buildvariants:
     multiversion_architecture: ppc64le
     multiversion_edition: enterprise
     use_default_timeouts: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -8986,9 +8926,6 @@ buildvariants:
     multiversion_platform: ubuntu1604
     multiversion_architecture: s390x
     multiversion_edition: enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -9044,9 +8981,6 @@ buildvariants:
     repo_edition: org
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -9083,9 +9017,6 @@ buildvariants:
     multiversion_platform: ubuntu1804
     multiversion_architecture: s390x
     multiversion_edition: enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -9143,9 +9074,6 @@ buildvariants:
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
     virtualenv: /opt/mongodbtoolchain/v3/bin/virtualenv
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -9198,9 +9126,6 @@ buildvariants:
     tooltags: "ssl"
     build_mongoreplay: true
     virtualenv: /opt/mongodbtoolchain/v3/bin/virtualenv
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -9260,9 +9185,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -9318,9 +9240,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -9394,8 +9313,6 @@ buildvariants:
     jstestfuzz_num_generated_files: 35
     target_resmoke_time: 20
     large_distro_name: windows-64-vs2017-compile
-  display_tasks:
-    - *dbtest
   tasks:
     - name: compile_TG
       requires:
@@ -9429,9 +9346,6 @@ buildvariants:
     tooltags: ""
     build_mongoreplay: false
     large_distro_name: windows-64-vs2017-compile
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -9491,8 +9405,6 @@ buildvariants:
     push_bucket: downloads.10gen.com
     push_name: win32
     push_arch: x86_64-enterprise-windows-64
-  display_tasks:
-  - *dbtest
   tasks:
   - name: compile_TG
     requires:
@@ -9553,9 +9465,6 @@ buildvariants:
   display_name: "* Enterprise Windows 2008R2 compile_all"
   run_on:
   - windows-64-vs2017-test
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -9629,9 +9538,6 @@ buildvariants:
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: false
     large_distro_name: windows-64-vs2017-compile
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -9685,9 +9591,6 @@ buildvariants:
     tooltags: "ssl"
     build_mongoreplay: false
     large_distro_name: windows-64-vs2017-compile
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -9775,9 +9678,6 @@ buildvariants:
     resmoke_jobs_max: 6
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: .aggregation !.auth !.encrypt !.unwind
@@ -9822,9 +9722,6 @@ buildvariants:
     compile_flags: --ssl --dbg=on --opt=on -j$(sysctl -n hw.logicalcpu) --libc++ --variables-files=etc/scons/xcode_macosx.vars
     tooltags: ""
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
@@ -9860,9 +9757,6 @@ buildvariants:
     resmoke_jobs_max: 6
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: audit
@@ -9900,9 +9794,6 @@ buildvariants:
     build_openssl: true
     openssl_config_flags: "-mmacosx-version-min=10.12"
     openssl_make_flags: "-j$(sysctl -n hw.logicalcpu)"
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: audit
@@ -10376,9 +10267,6 @@ buildvariants:
     target_resmoke_time: 10
     large_distro_name: rhel62-large
     burn_in_tag_buildvariants: enterprise-rhel-62-64-bit-majority-read-concern-off enterprise-rhel-62-64-bit-inmem linux-64-duroff
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     requires:
@@ -10555,9 +10443,6 @@ buildvariants:
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
     large_distro_name: rhel62-large
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -10636,8 +10521,6 @@ buildvariants:
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
     large_distro_name: rhel62-large
-  display_tasks:
-  - *dbtest
   tasks:
   - name: compile_TG
     distros:
@@ -10754,9 +10637,6 @@ buildvariants:
     use_scons_cache: false
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
-  display_tasks:
-    - *dbtest
-    - *unittests
   tasks:
     - name: compile_all_run_unittests_TG
     - name: .aggregation !.unwind
@@ -10818,9 +10698,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -10880,9 +10757,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11008,9 +10882,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11061,9 +10932,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11116,9 +10984,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11192,9 +11057,6 @@ buildvariants:
     multiversion_platform: rhel71
     multiversion_architecture: ppc64le
     multiversion_edition: enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11253,9 +11115,6 @@ buildvariants:
     multiversion_platform: rhel72
     multiversion_architecture: s390x
     multiversion_edition: enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11309,9 +11168,6 @@ buildvariants:
     repo_edition: enterprise
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11362,9 +11218,6 @@ buildvariants:
     repo_edition: org
     build_mongoreplay: true
     tooltags: "ssl"
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11394,9 +11247,6 @@ buildvariants:
     repo_edition: org
     build_mongoreplay: true
     tooltags: "ssl"
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11436,9 +11286,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11479,9 +11326,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11499,9 +11343,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: ""
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11535,9 +11376,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11584,9 +11422,6 @@ buildvariants:
     multiversion_platform: suse12
     multiversion_architecture: s390x
     multiversion_edition: enterprise
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11641,9 +11476,6 @@ buildvariants:
     multiversion_platform: suse12
     multiversion_architecture: s390x
     multiversion_edition: targeted
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11677,9 +11509,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: "ssl"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11832,9 +11661,6 @@ buildvariants:
     tooltags: "ssl sasl gssapi"
     scons_cache_scope: shared
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11881,9 +11707,6 @@ buildvariants:
     tooltags: "ssl"
     scons_cache_scope: shared
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11931,9 +11754,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: ""
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -11956,9 +11776,6 @@ buildvariants:
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
     large_distro_name: rhel62-large
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -12029,8 +11846,6 @@ buildvariants:
     additional_targets: mongoebench mongoed
   display_tasks:
   - *benchrun_embedded
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -12081,9 +11896,6 @@ buildvariants:
     resmoke_jobs_max: 8 # Avoid starting too many mongod's on ARM test servers
     build_mongoreplay: true
     additional_targets: mongoebench mongoed
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
@@ -12153,9 +11965,6 @@ buildvariants:
     resmoke_jobs_max: 4
     build_mongoreplay: true
     additional_targets: mongoebench mongoed
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: aggregation
@@ -12189,9 +11998,6 @@ buildvariants:
     scons_cache_scope: shared
     tooltags: ""
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -12243,9 +12049,6 @@ buildvariants:
     test_flags: --storageEngine=inMemory --excludeWithAnyTags=requires_persistence,requires_journaling
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -12288,9 +12091,6 @@ buildvariants:
     test_flags: --storageEngine=inMemory --excludeWithAnyTags=requires_persistence,requires_journaling
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros:
@@ -12349,9 +12149,6 @@ buildvariants:
     hang_analyzer_dump_core: false
     scons_cache_scope: shared
     test_flags: --excludeWithAnyTags=requires_fast_memory
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: .aggregation
@@ -12413,9 +12210,6 @@ buildvariants:
     scons_cache_scope: shared
     target_resmoke_time: 15
     test_flags: --excludeWithAnyTags=requires_fast_memory
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: .aggfuzzer .common
@@ -12442,9 +12236,6 @@ buildvariants:
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
     scons_cache_scope: shared
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: .aggregation
@@ -12501,9 +12292,6 @@ buildvariants:
     build_mongoreplay: true
     hang_analyzer_dump_core: false
     scons_cache_scope: shared
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: causally_consistent_jscore_txns_passthrough
@@ -12562,9 +12350,6 @@ buildvariants:
         --mongodSetParameters="adaptiveServiceExecutorReservedThreads: 8" \
         --mongosSetParameters="adaptiveServiceExecutorReservedThreads: 8"
     scons_cache_scope: shared
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
   - name: .aggregation !.no_async
@@ -12604,9 +12389,6 @@ buildvariants:
     scons_cache_mode: all
     tooltags: "ssl sasl gssapi"
     build_mongoreplay: true
-  display_tasks:
-  - *dbtest
-  - *unittests
   tasks:
   - name: compile_all_run_unittests_TG
     distros: