diff --git a/buildscripts/yamllinters.sh b/buildscripts/yamllinters.sh index 4e0807815dd..9c63da1e01b 100755 --- a/buildscripts/yamllinters.sh +++ b/buildscripts/yamllinters.sh @@ -5,5 +5,8 @@ cd "$BASEDIR/../" yamllint -c etc/yamllint_config.yml buildscripts etc jstests -PATH="$PATH:$HOME" evergreen evaluate $EVERGREEN_CONFIG_FILE_PATH > etc/evaluated_evergreen.yml +PATH="$PATH:$HOME" evergreen evaluate etc/evergreen.yml > etc/evaluated_evergreen.yml +PATH="$PATH:$HOME" evergreen evaluate etc/evergreen_nightly.yml > etc/evaluated_evergreen_nightly.yml +PATH="$PATH:$HOME" evergreen evaluate etc/system_perf.yml > etc/evaluated_system_perf.yml + python -m evergreen_lint -c ./etc/evergreen_lint.yml lint diff --git a/etc/evergreen_lint.yml b/etc/evergreen_lint.yml index dccd6af0c98..fdea4103d4f 100644 --- a/etc/evergreen_lint.yml +++ b/etc/evergreen_lint.yml @@ -1,6 +1,7 @@ # These paths are relative to the directory containing this configuration file files: - evaluated_evergreen.yml + - evaluated_evergreen_nightly.yml help_url: https://wiki.corp.mongodb.com/pages/viewpage.action?pageId=133273894 rules: @@ -91,3 +92,14 @@ rules: - assigned_to_jira_team_streams min_num_of_tags: 1 max_num_of_tags: 1 + + - rule: "enforce-tags-for-variants" + tags: + # Required variants should have "required" tag + - tag_name: "required" + variant_config: + display_name_regex: "^!.+$" + # Suggested variants should have "suggested" tag + - tag_name: "suggested" + variant_config: + display_name_regex: "^\\*.+$" diff --git a/etc/evergreen_yml_components/variants/amazon/test_dev.yml b/etc/evergreen_yml_components/variants/amazon/test_dev.yml index e822ce0dd7c..a1ab3c1a688 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_dev.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_dev.yml @@ -76,7 +76,7 @@ buildvariants: - <<: *linux-arm64-dynamic-compile-params name: &amazon-linux2-arm64-crypt-compile amazon-linux2-arm64-crypt-compile display_name: "! Amazon Linux 2 arm64 Crypt Compile" - tags: ["bazel_check"] + tags: ["required", "bazel_check"] expansions: <<: *linux-arm64-dynamic-enterprise-compile-expansions compile_variant: *amazon-linux2-arm64-crypt-compile @@ -87,7 +87,7 @@ buildvariants: - <<: *linux-arm64-dynamic-compile-params name: &amazon-linux2-arm64-dynamic-compile amazon-linux2-arm64-dynamic-compile display_name: "! Amazon Linux 2 arm64 Enterprise Shared Library Compile & Static Analysis" - tags: ["bazel_check"] + tags: ["required", "bazel_check"] expansions: <<: *linux-arm64-dynamic-enterprise-compile-expansions clang_tidy_toolchain: v4 @@ -109,6 +109,7 @@ buildvariants: <<: *amazon_linux2_arm64_dynamic_compile_variant_dependency name: &enterprise-amazon-linux2-arm64 enterprise-amazon-linux2-arm64 display_name: "* Amazon Linux 2 arm64 Enterprise" + tags: ["suggested"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - amazon2-arm64-small @@ -133,8 +134,8 @@ buildvariants: - name: &commit-queue commit-queue display_name: "~ Commit Queue" - cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter tags: ["bazel_check"] + cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter run_on: - amazon2-arm64-small stepback: false @@ -178,6 +179,7 @@ buildvariants: - <<: *amazon_linux2_arm64_dynamic_compile_variant_dependency name: amazon-linux2-arm64-try-sbe-engine display_name: "Amazon Linux 2 arm64 Enterprise Query Patch Only (trySbeEngine)" + tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. run_on: - amazon2-arm64-small diff --git a/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml index 392a86cd937..f9863aad824 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml @@ -76,7 +76,7 @@ buildvariants: - <<: *linux-arm64-dynamic-compile-params name: &amazon-linux2-arm64-stitch-compile amazon-linux2-arm64-stitch-compile display_name: "* Amazon Linux 2 arm64 Enterprise Stitch Compile" - tags: ["bazel_check"] + tags: ["suggested", "bazel_check"] expansions: <<: *linux-arm64-dynamic-enterprise-compile-expansions compile_variant: *amazon-linux2-arm64-stitch-compile @@ -86,6 +86,7 @@ buildvariants: - <<: *linux-arm64-dynamic-compile-params name: &amazon-linux2-arm64-dev-compile amazon-linux2-arm64-dev-compile display_name: "* Amazon Linux 2 arm64 Enterprise Dev Compile" + tags: ["suggested"] expansions: <<: *linux-arm64-dynamic-enterprise-compile-expansions compile_variant: *amazon-linux2-arm64-dev-compile @@ -96,6 +97,7 @@ buildvariants: # Caching is purposefully disabled on this variant so we can benchmark consistent build times. - name: &amazon-linux2-arm64-local-compile amazon-linux2-arm64-local-compile display_name: "Amazon Linux 2 arm64 Local Compile" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - amazon2-arm64-large @@ -118,8 +120,8 @@ buildvariants: # This will eventually become suggested, then required. - name: &amazon-linux-2023-arm64-bazel-compile amazon-linux-2023-arm64-bazel-compile display_name: "Amazon Linux 2023 Enterprise arm64 Bazel Compile" - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - amazon2023.0-arm64-small stepback: false @@ -134,8 +136,8 @@ buildvariants: # This will eventually become suggested, then required. - name: &rhel81-ppc64le-bazel-compile rhel81-ppc64le-bazel-compile display_name: "RHEL 8.1 PPC64LE Bazel Compile" - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel81-power8-small stepback: false @@ -153,8 +155,8 @@ buildvariants: # This will eventually become suggested, then required. - name: &rhel83-s390x-bazel-compile rhel83-s390x-bazel-compile display_name: "RHEL 8.3 S390X Bazel Compile" - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel83-zseries-small stepback: false @@ -174,6 +176,7 @@ buildvariants: # binary candidate passes their tests and is therefore safe to use in their pre-commit integration tests. - name: amazon-linux-2023-x86-mongot-integration-cron-only display_name: "AL2023 x86 mongot integration tasks cron only" + tags: [] cron: "0 */4 * * *" # Run these tasks every 4 hours patchable: false run_on: @@ -212,6 +215,7 @@ buildvariants: # binary candidate passes their tests and is therefore safe to use in their pre-commit integration tests. - name: amazon2023-arm64-mongot-integration-cron-only display_name: "AL2023 arm64 mongot integration tasks cron only" + tags: [] cron: "0 */4 * * *" # Run these tasks every 4 hours patchable: false run_on: @@ -254,6 +258,7 @@ buildvariants: # binary candidate passes their tests and is therefore safe to use in their pre-commit integration tests. - name: amazon-linux2-arm64-mongot-integration-cron-only display_name: "AL2 arm64 mongot integration tasks cron only" + tags: [] cron: "0 */4 * * *" # Run these tasks every 4 hours patchable: false run_on: @@ -292,6 +297,7 @@ buildvariants: # binary candidate passes their tests and is therefore safe to use in their pre-commit integration tests - name: amazon2-x86-mongot-integration-cron-only display_name: "AL2 x86 mongot integration tasks cron only" + tags: [] cron: "0 */4 * * *" # Run these tasks every 4 hours patchable: false run_on: @@ -329,6 +335,7 @@ buildvariants: <<: *amazon_linux2_arm64_dynamic_compile_variant_dependency name: &enterprise-amazon-linux2-arm64-all-feature-flags enterprise-amazon-linux2-arm64-all-feature-flags display_name: "! Amazon Linux 2 arm64 Enterprise (all feature flags)" + tags: ["required"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - amazon2-arm64-small @@ -358,6 +365,7 @@ buildvariants: <<: *enterprise-amazon-linux2-arm64-all-feature-flags-template name: enterprise-amazon-linux2-arm64-all-feature-flags-fuzzers display_name: "*| Amazon Linux 2 arm64 Enterprise (all feature flags) Fuzzers" + tags: ["suggested"] tasks: - name: .aggfuzzer - name: .change_stream_fuzzer @@ -366,6 +374,7 @@ buildvariants: - name: &al2023-arm64-sep-benchmark al2023-arm64-sep-benchmark display_name: "! AL2023 arm64 Enterprise (SEP Benchmark)" + tags: ["required"] cron: "0 */4 * * *" run_on: - amazon2023.0-arm64-large diff --git a/etc/evergreen_yml_components/variants/amazon/test_release.yml b/etc/evergreen_yml_components/variants/amazon/test_release.yml index a767636e5af..43ea41f00e0 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_release.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_release.yml @@ -7,6 +7,7 @@ buildvariants: - name: enterprise-amazon2-openssl111 display_name: "Enterprise Amazon Linux 2 (openssl 1.1.1)" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - amazon2-openssl111-small @@ -53,6 +54,7 @@ buildvariants: - name: enterprise-amazon2-arm64-openssl111 display_name: "Enterprise Amazon Linux 2 arm64 (openssl 1.1.1)" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - amazon2-arm64-openssl111-small @@ -101,8 +103,8 @@ buildvariants: - name: amazon2023 display_name: Amazon Linux 2023 - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - amazon2023.0-small expansions: @@ -139,6 +141,7 @@ buildvariants: - name: enterprise-amazon2023 display_name: "Enterprise Amazon Linux 2023" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - amazon2023.0-small @@ -181,6 +184,7 @@ buildvariants: # We just want it to bake for a while before considering that we turn it on by default. - name: enterprise-amazon2023-lto display_name: "Enterprise Amazon Linux 2023 LTO" + tags: [] # TODO(SERVER-85904): Re-enable this to run in nightly once Bazel supports LTO. # cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. activate: false @@ -224,8 +228,8 @@ buildvariants: - name: amazon2023-arm64 display_name: Amazon Linux 2023 arm64 - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - amazon2023.0-arm64-small expansions: @@ -263,6 +267,7 @@ buildvariants: - name: enterprise-amazon2023-arm64 display_name: "Enterprise Amazon Linux 2023 arm64" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - amazon2023.0-arm64-small @@ -305,6 +310,7 @@ buildvariants: # We just want it to bake for a while before considering that we turn it on by default. - name: enterprise-amazon2023-arm64-lto display_name: "Enterprise Amazon Linux 2023 arm64 LTO" + tags: [] # TODO(SERVER-85904): Re-enable this to run in nightly once Bazel supports LTO. # cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. activate: false @@ -348,6 +354,7 @@ buildvariants: - name: enterprise-amazon2-streams display_name: "Amazon Linux 2 enterprise build with streams" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - amazon2-test diff --git a/etc/evergreen_yml_components/variants/atlas/test_release.yml b/etc/evergreen_yml_components/variants/atlas/test_release.yml index ac7e22397d4..dfab8f8628b 100644 --- a/etc/evergreen_yml_components/variants/atlas/test_release.yml +++ b/etc/evergreen_yml_components/variants/atlas/test_release.yml @@ -7,6 +7,7 @@ buildvariants: - name: enterprise-rhel-79-64-bit display_name: "Enterprise RHEL 7.9" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel7.9-small diff --git a/etc/evergreen_yml_components/variants/debian/test_release.yml b/etc/evergreen_yml_components/variants/debian/test_release.yml index c1856b6ade6..e7ec83b9c7f 100644 --- a/etc/evergreen_yml_components/variants/debian/test_release.yml +++ b/etc/evergreen_yml_components/variants/debian/test_release.yml @@ -7,8 +7,8 @@ buildvariants: - name: enterprise-debian10-64 display_name: Jepsen Tests on Enterprise Debian 10 - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - debian10-test expansions: @@ -30,8 +30,8 @@ buildvariants: - name: debian12 display_name: Debian 12 - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - debian12-small expansions: @@ -70,6 +70,7 @@ buildvariants: - name: enterprise-debian12-64 display_name: Enterprise Debian 12 + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - debian12-small diff --git a/etc/evergreen_yml_components/variants/ibm/test_release_master_and_lts_branches_only.yml b/etc/evergreen_yml_components/variants/ibm/test_release_master_and_lts_branches_only.yml index ac4cdbe88c3..8a0f79cf68c 100644 --- a/etc/evergreen_yml_components/variants/ibm/test_release_master_and_lts_branches_only.yml +++ b/etc/evergreen_yml_components/variants/ibm/test_release_master_and_lts_branches_only.yml @@ -8,10 +8,10 @@ buildvariants: - &enterprise-rhel-81-ppc64le-template name: enterprise-rhel-81-ppc64le display_name: Enterprise RHEL 8.1 PPC64LE + tags: ["bazel_check"] run_on: - rhel81-power8-small cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter - tags: ["bazel_check"] stepback: false expansions: &enterprise-rhel-81-ppc64le-expansions-template additional_package_targets: >- @@ -77,10 +77,10 @@ buildvariants: - &enterprise-rhel-83-s390x-template name: enterprise-rhel-83-s390x display_name: Enterprise RHEL 8.3 s390x + tags: ["bazel_check"] run_on: - rhel83-zseries-small cron: "0 4 * * 0" - tags: ["bazel_check"] stepback: false expansions: &enterprise-rhel-83-s390x-expansions-template additional_package_targets: >- diff --git a/etc/evergreen_yml_components/variants/macos/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/macos/test_dev_master_branch_only.yml index 17e5aa4e512..a9300597dbb 100644 --- a/etc/evergreen_yml_components/variants/macos/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/macos/test_dev_master_branch_only.yml @@ -9,8 +9,8 @@ buildvariants: # This will eventually become suggested, then required. - name: &macos-amd64-bazel-compile macos-amd64-bazel-compile display_name: "MacOS AMD64 Bazel Compile" - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - macos-1100 expansions: @@ -38,8 +38,8 @@ buildvariants: # This will eventually become suggested, then required. - name: &macos-arm64-bazel-compile macos-arm64-bazel-compile display_name: "MacOS ARM64 Bazel Compile" - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - macos-1100-arm64 expansions: @@ -65,9 +65,9 @@ buildvariants: - name: &enterprise-macos-arm64 enterprise-macos-arm64 display_name: "~ Enterprise macOS arm64" + tags: ["bazel_check"] run_on: - macos-1100-arm64 - tags: ["bazel_check"] expansions: compile_variant: *enterprise-macos-arm64 test_flags: --excludeWithAnyTags=incompatible_with_macos,requires_gcm diff --git a/etc/evergreen_yml_components/variants/macos/test_release.yml b/etc/evergreen_yml_components/variants/macos/test_release.yml index a291b732de0..0a779e39399 100644 --- a/etc/evergreen_yml_components/variants/macos/test_release.yml +++ b/etc/evergreen_yml_components/variants/macos/test_release.yml @@ -7,6 +7,7 @@ buildvariants: - name: macos display_name: macOS + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - macos-1100 @@ -35,6 +36,7 @@ buildvariants: - name: macos-arm64 display_name: macOS arm64 + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - macos-1100-arm64 @@ -63,8 +65,8 @@ buildvariants: - name: enterprise-macos display_name: Enterprise macOS - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - macos-1100 expansions: @@ -92,8 +94,8 @@ buildvariants: - name: enterprise-macos-arm64 display_name: Enterprise macOS arm64 - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - macos-1100-arm64 expansions: diff --git a/etc/evergreen_yml_components/variants/misc/misc.yml b/etc/evergreen_yml_components/variants/misc/misc.yml index 1b9c8e1a58b..060ab2ccc37 100644 --- a/etc/evergreen_yml_components/variants/misc/misc.yml +++ b/etc/evergreen_yml_components/variants/misc/misc.yml @@ -7,6 +7,7 @@ buildvariants: - name: run-all-affected-jstests display_name: "! Run All Affected JStests" + tags: ["required"] patch_only: true run_on: - rhel80-medium @@ -41,6 +42,7 @@ buildvariants: - name: ©bara-sync-between-repos copybara-sync-between-repos display_name: "* Copybara Sync Between Repos" + tags: ["suggested"] activate: true run_on: - ubuntu2204-small @@ -51,6 +53,7 @@ buildvariants: - name: enterprise-windows-ninja display_name: "Ninja Build: Enterprise Windows" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. expansions: compile_flags: >- @@ -71,6 +74,7 @@ buildvariants: - name: macos-enterprise-ninja display_name: "Ninja Build: macOS Enterprise" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - macos-1100 @@ -84,6 +88,7 @@ buildvariants: - name: macos-ninja-build-profiles display_name: "Ninja Build Profiles: macOS" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - macos-1100 @@ -98,6 +103,7 @@ buildvariants: - name: macos-arm-ninja-build-profiles display_name: "Ninja Build Profiles: macOS ARM" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - macos-1100-arm64 @@ -112,6 +118,7 @@ buildvariants: - name: windows-ninja-build-profiles display_name: "Ninja Build Profiles: Windows" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. expansions: compile_flags: >- @@ -137,6 +144,7 @@ buildvariants: - name: ubuntu1804-ninja-build-profiles display_name: "Ninja Build Profiles: Ubuntu 18.04" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - ubuntu1804-small @@ -165,6 +173,7 @@ buildvariants: - name: enterprise-rhel-80-64-bit-dynamic-ninja display_name: "Ninja Build: Enterprise RHEL 8.0" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small diff --git a/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml b/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml index e701061e12d..64ff0b70009 100644 --- a/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/misc/misc_master_branch_only.yml @@ -7,6 +7,7 @@ buildvariants: - name: &enterprise-windows-build-metrics enterprise-windows-build-metrics display_name: "~ Build Metrics Enterprise Windows" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. stepback: false run_on: @@ -24,6 +25,7 @@ buildvariants: - name: &macos-enterprise-build-metrics macos-enterprise-build-metrics display_name: "~ Build Metrics Enterprise MacOS" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. stepback: false run_on: @@ -41,6 +43,7 @@ buildvariants: - name: &enterprise-rhel-80-64-bit-build-metrics enterprise-rhel-80-64-bit-build-metrics display_name: "~ Build Metrics Enterprise RHEL 8.0 " + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter stepback: false run_on: @@ -59,6 +62,7 @@ buildvariants: - name: &enterprise-rhel-80-aarch64-build-metrics enterprise-rhel-80-aarch64-build-metrics display_name: "~ Build Metrics Enterprise AL22 ARM" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter stepback: false run_on: @@ -76,6 +80,7 @@ buildvariants: - name: &shared-scons-cache-pruning shared-scons-cache-pruning display_name: "Shared SCons Cache Pruning" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - ubuntu2204-small @@ -85,6 +90,7 @@ buildvariants: - name: &windows-shared-scons-cache-pruning windows-shared-scons-cache-pruning display_name: "Windows shared SCons Cache Pruning" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - windows-vsCurrent-small @@ -96,6 +102,7 @@ buildvariants: - name: &stm-daily-cron stm-daily-cron display_name: "* STM Daily Cron" + tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small diff --git a/etc/evergreen_yml_components/variants/misc/task_generation.yml b/etc/evergreen_yml_components/variants/misc/task_generation.yml index 8e5d6c22bbd..03f81c154fa 100644 --- a/etc/evergreen_yml_components/variants/misc/task_generation.yml +++ b/etc/evergreen_yml_components/variants/misc/task_generation.yml @@ -3,6 +3,7 @@ buildvariants: - name: generate-tasks-for-version display_name: "! Generate tasks for evergreen version" + tags: ["required"] activate: true run_on: - rhel80-medium diff --git a/etc/evergreen_yml_components/variants/rhel/test_dev.yml b/etc/evergreen_yml_components/variants/rhel/test_dev.yml index a6b1248049c..4dcbc4dfa39 100644 --- a/etc/evergreen_yml_components/variants/rhel/test_dev.yml +++ b/etc/evergreen_yml_components/variants/rhel/test_dev.yml @@ -131,6 +131,7 @@ buildvariants: - <<: *linux-x86-dynamic-compile-params name: &linux-x86-dynamic-compile linux-x86-dynamic-compile display_name: "* Linux x86 Enterprise Shared Library" + tags: ["suggested"] expansions: <<: *linux-x86-dynamic-enterprise-compile-expansions compile_variant: *linux-x86-dynamic-compile @@ -147,6 +148,7 @@ buildvariants: <<: *linux_x86_dynamic_compile_variant_dependency name: &enterprise-rhel-80-64-bit-dynamic enterprise-rhel-80-64-bit-dynamic display_name: "* Shared Library Enterprise RHEL 8.0" + tags: ["suggested"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - rhel80-small @@ -171,6 +173,7 @@ buildvariants: <<: *linux_x86_dynamic_compile_variant_dependency name: enterprise-rhel-80-64-bit-dynamic-config-shard display_name: "* Shared Library Enterprise RHEL 8.0 (Config Shard)" + tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small @@ -219,6 +222,7 @@ buildvariants: <<: *linux_x86_dynamic_compile_variant_dependency name: enterprise-rhel-80-64-bit-dynamic-classic-engine display_name: "Shared Library Enterprise RHEL 8.0 (Classic Engine)" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small @@ -344,6 +348,7 @@ buildvariants: - <<: *linux_debug_aubsan_compile_variant_dependency name: &rhel80-debug-aubsan-classic-engine rhel80-debug-aubsan-classic-engine display_name: "* {A,UB}SAN Enterprise RHEL 8.0 DEBUG (Classic Engine)" + tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-build diff --git a/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml b/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml index 7c0a6ecb661..ed085c2589f 100644 --- a/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml +++ b/etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml @@ -7,6 +7,7 @@ buildvariants: - name: enterprise-rhel-80-64-bit-inmem display_name: Enterprise RHEL 8.0 (inMemory) + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small diff --git a/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml index aac6f27c0c7..db6e6a42239 100644 --- a/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml @@ -181,6 +181,7 @@ buildvariants: - <<: *generic_linux_compile_params name: &linux-x86-dynamic-compile-future-tag-multiversion linux-x86-dynamic-compile-future-tag-multiversion display_name: "Linux x86 Shared Library Compile (future git tag multiversion)" + tags: [] expansions: <<: *linux-x86-dynamic-enterprise-compile-expansions bv_future_git_tag: r100.0.0-9999 @@ -192,6 +193,7 @@ buildvariants: - <<: *linux-x86-dynamic-compile-params name: &linux-stitch-compile-suggested linux-stitch-compile-suggested display_name: "* Linux x86 Stitch Enterprise Compile" + tags: ["suggested"] expansions: <<: *linux-x86-dynamic-enterprise-compile-expansions compile_variant: *linux-stitch-compile-suggested @@ -201,6 +203,7 @@ buildvariants: - <<: *linux-x86-dynamic-compile-params name: &linux-crypt-compile linux-crypt-compile display_name: "* Linux x86 Crypt Enterprise Compile" + tags: ["suggested"] expansions: <<: *linux-x86-dynamic-enterprise-compile-expansions crypt_task_compile_flags: >- @@ -215,6 +218,7 @@ buildvariants: - <<: *generic_linux_compile_params name: &linux-x86-dynamic-grpc-suggested linux-x86-dynamic-grpc-suggested display_name: "* Linux x86 Shared Library Enterprise with GRPC" + tags: ["suggested"] stepback: false expansions: <<: *generic_linux_compile_expansions @@ -260,6 +264,7 @@ buildvariants: <<: *linux_x86_dynamic_compile_variant_dependency name: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags enterprise-rhel-80-64-bit-dynamic-all-feature-flags display_name: "* Shared Library Enterprise RHEL 8.0 (all feature flags)" + tags: ["suggested"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - rhel80-small @@ -302,6 +307,7 @@ buildvariants: <<: *linux_x86_dynamic_compile_variant_dependency name: enterprise-rhel-80-64-bit-dynamic-embedded-router display_name: "* Shared Library Enterprise RHEL 8.0 (Embedded Router all feature flags)" + tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small @@ -324,6 +330,7 @@ buildvariants: - name: &enterprise-rhel-80-benchmarks enterprise-rhel-80-benchmarks display_name: "* Enterprise RHEL 8.0 (Benchmarks)" + tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-medium @@ -346,6 +353,7 @@ buildvariants: - <<: *linux_x86_dynamic_compile_variant_dependency name: &enterprise-rhel-80-64-bit-large-txns-format enterprise-rhel-80-64-bit-large-txns-format display_name: "Enterprise RHEL 8.0 (large transactions format)" + tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter run_on: - rhel80-small @@ -408,6 +416,7 @@ buildvariants: <<: *linux_x86_dynamic_compile_variant_dependency name: &enterprise-rhel-80-64-bit-multiversion enterprise-rhel-80-64-bit-multiversion display_name: "Enterprise RHEL 8.0 (implicit multiversion)" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small @@ -422,6 +431,7 @@ buildvariants: - <<: *linux-x86-multiversion-template name: &enterprise-rhel-80-64-bit-multiversion-all-feature-flags enterprise-rhel-80-64-bit-multiversion-all-feature-flags display_name: "Enterprise RHEL 8.0 (implicit multiversion & all feature flags)" + tags: [] expansions: <<: *linux-x86-multiversion-expansions-template # No feature flag tests since they aren't compatible with the older binaries. @@ -435,6 +445,7 @@ buildvariants: <<: *linux-x86-multiversion-template name: &enterprise-rhel-80-64-bit-future-git-tag-multiversion enterprise-rhel-80-64-bit-future-git-tag-multiversion display_name: "Enterprise RHEL 8.0 (future git tag multiversion)" + tags: [] expansions: <<: *linux_x86_generic_expansions scons_cache_scope: shared @@ -466,6 +477,7 @@ buildvariants: - <<: *enterprise-rhel-79-64-bit-template name: &hot_backups-rhel-79-64-bit hot_backups-rhel-79-64-bit display_name: "hot_backups RHEL 7.9" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel7.9-small @@ -501,6 +513,7 @@ buildvariants: - name: &enterprise-rhel80-no-latch-64-bit enterprise-rhel80-no-latch-64-bit display_name: "~ Enterprise RHEL 8.0 (without Diagnostic Latches)" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. expansions: compile_flags: >- @@ -528,6 +541,7 @@ buildvariants: - name: &enterprise-rhel80-sdam-replica-set-monitor-64-bit enterprise-rhel80-sdam-replica-set-monitor-64-bit display_name: "~ Enterprise RHEL 8.0 (with SdamReplicaSetMonitor)" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small @@ -570,6 +584,7 @@ buildvariants: - name: &enterprise-rhel80-sharding-task-executor-pool-rsm-matchPrimary-64-bit enterprise-rhel80-sharding-task-executor-pool-rsm-matchPrimary-64-bit display_name: '~ Enterprise RHEL 8.0 (with {ShardingTaskExecutorPoolReplicaSetMatching: "matchPrimaryNode"})' + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small @@ -611,6 +626,7 @@ buildvariants: - name: &enterprise-rhel80-sharding-task-executor-pool-rsm-matchBusiest-64-bit enterprise-rhel80-sharding-task-executor-pool-rsm-matchBusiest-64-bit display_name: '~ Enterprise RHEL 8.0 (with {ShardingTaskExecutorPoolReplicaSetMatching: "matchBusiestNode"})' + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small @@ -657,6 +673,7 @@ buildvariants: - name: &enterprise-rhel80-sharding-task-executor-pool-rsm-disabled-64-bit enterprise-rhel80-sharding-task-executor-pool-rsm-disabled-64-bit display_name: '~ Enterprise RHEL 8.0 (with {ShardingTaskExecutorPoolReplicaSetMatching: "disabled"})' + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small @@ -706,6 +723,7 @@ buildvariants: - <<: *linux_x86_dynamic_compile_variant_dependency name: &enterprise-rhel-80-64-bit-old-unique-index-format enterprise-rhel-80-64-bit-old-unique-index-format display_name: "Enterprise RHEL 8.0 (old unique index format)" + tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter run_on: - rhel80-small @@ -744,6 +762,7 @@ buildvariants: - name: &enterprise-rhel80-join-ingress-sessions-on-shutdown enterprise-rhel80-join-ingress-sessions-on-shutdown display_name: '~ Enterprise RHEL 8.0 (with {joinIngressSessionsOnShutdown: "true"})' + tags: [] activate: false run_on: - rhel80-small @@ -796,6 +815,7 @@ buildvariants: - name: &enterprise-rhel-80-64-bit-dynamic-classic-engine-query-patch-only enterprise-rhel-80-64-bit-dynamic-classic-engine-query-patch-only display_name: "~ Shared Library Enterprise RHEL 8.0 Query Patch Only (Classic Engine)" + tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. run_on: - rhel80-small @@ -917,6 +937,7 @@ buildvariants: <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-template name: enterprise-rhel-80-64-bit-dynamic-classic-engine-all-feature-flags-required-query-patch-only display_name: "~ Shared Library Enterprise RHEL 8.0 Query Patch Only (Classic Engine all feature flags)" + tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. expansions: <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions @@ -1039,6 +1060,7 @@ buildvariants: - <<: *enterprise-rhel-80-64-bit-dynamic-classic-engine-all-feature-flags-required-query-patch-only-template name: enterprise-rhel-80-64-bit-dynamic-classic-engine-all-feature-flags-fuzzers display_name: "*| Shared Library Enterprise RHEL 8.0 (Classic Engine all feature flags) Fuzzers" + tags: ["suggested"] tasks: - name: .aggfuzzer - name: .change_stream_fuzzer @@ -1048,6 +1070,7 @@ buildvariants: - <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-template name: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-query-patch-only enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-query-patch-only display_name: "~ Shared Library Enterprise RHEL 8.0 Query Patch Only (all feature flags)" + tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. expansions: <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions @@ -1063,6 +1086,7 @@ buildvariants: - <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-template name: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-security-patch-only enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-security-patch-only display_name: "~ Shared Library Enterprise RHEL 8.0 Security Patch Only (all feature flags)" + tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. expansions: <<: *enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions @@ -1086,6 +1110,7 @@ buildvariants: - name: &tla-plus tla-plus display_name: "TLA+" + tags: [] run_on: - rhel80-build cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter diff --git a/etc/evergreen_yml_components/variants/rhel/test_release.yml b/etc/evergreen_yml_components/variants/rhel/test_release.yml index a439efa4f25..dc37b370e22 100644 --- a/etc/evergreen_yml_components/variants/rhel/test_release.yml +++ b/etc/evergreen_yml_components/variants/rhel/test_release.yml @@ -7,6 +7,7 @@ buildvariants: - name: ubi8 display_name: "UBI 8" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - ubi8 @@ -38,6 +39,7 @@ buildvariants: - name: rhel80 display_name: RHEL 8.0 + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-build @@ -77,6 +79,7 @@ buildvariants: - name: enterprise-rhel-80-64-bit display_name: "Enterprise RHEL 8.0" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-small @@ -165,6 +168,7 @@ buildvariants: - name: enterprise-rhel-82-arm64 display_name: "Enterprise RHEL 8.2 arm64" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel82-arm64-small @@ -206,8 +210,8 @@ buildvariants: - name: rhel90 display_name: RHEL 9.0 - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel90-build expansions: @@ -246,6 +250,7 @@ buildvariants: - name: enterprise-rhel-90-64-bit display_name: "Enterprise RHEL 9.0" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel90-small @@ -286,8 +291,8 @@ buildvariants: - name: rhel90-arm64 display_name: RHEL 9.0 arm64 - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel90-arm64-small expansions: @@ -323,6 +328,7 @@ buildvariants: - name: enterprise-rhel-90-arm64 display_name: "Enterprise RHEL 9.0 arm64" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel90-arm64-small @@ -365,6 +371,7 @@ buildvariants: - name: enterprise-rhel-82-arm64-grpc display_name: "Enterprise RHEL 8.2 arm64 GRPC" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel82-arm64-large diff --git a/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml b/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml index 54e429fc899..cd28f591fb3 100644 --- a/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml +++ b/etc/evergreen_yml_components/variants/sanitizer/test_dev.yml @@ -118,6 +118,7 @@ buildvariants: - <<: *generic_linux_compile_params name: &linux-x86-dynamic-debug-compile-required linux-x86-dynamic-debug-compile-required # TODO: replace with Sanitizer. display_name: "! Linux x86 Shared Library DEBUG Compile" + tags: ["required"] stepback: false expansions: <<: *linux_debug_community_compile_expansions @@ -131,6 +132,7 @@ buildvariants: - <<: *generic_linux_compile_params name: &linux-debug-aubsan-compile-required linux-debug-aubsan-compile-required display_name: "! Linux x86 Shared Library {A,UB}SAN Enterprise Compile" + tags: ["required"] expansions: <<: *generic_linux_compile_expansions separate_debug: off @@ -156,6 +158,7 @@ buildvariants: <<: *linux_x86_dynamic_debug_compile_variant_dependency name: &linux-64-debug-required linux-64-debug-required display_name: "! Linux x86 Shared Library DEBUG" + tags: ["required"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - rhel80-medium @@ -177,6 +180,7 @@ buildvariants: <<: *linux_debug_aubsan_compile_variant_dependency name: &rhel80-debug-aubsan-lite rhel80-debug-aubsan-lite display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG" + tags: ["suggested"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - rhel80-build @@ -189,6 +193,7 @@ buildvariants: - name: rhel80-asan display_name: ~ ASAN RHEL 8.0 + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-build @@ -225,6 +230,7 @@ buildvariants: - name: rhel80-debug-asan display_name: ~ ASAN Enterprise RHEL 8.0 DEBUG + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-build @@ -315,8 +321,8 @@ buildvariants: - name: rhel80-debug-ubsan display_name: ~ UBSAN Enterprise RHEL 8.0 DEBUG - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-build stepback: false @@ -400,6 +406,7 @@ buildvariants: - &rhel80-debug-aubsan-lite_fuzzer-template name: &rhel80-debug-aubsan-lite_fuzzer rhel80-debug-aubsan-lite_fuzzer display_name: "{A,UB}SAN Enterprise RHEL 8.0 FUZZER" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-build diff --git a/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml index a2288dc2f6b..40f349232c8 100644 --- a/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml @@ -116,6 +116,7 @@ buildvariants: - name: &enterprise-rhel-80-64-bit-dynamic-debug-mode enterprise-rhel-80-64-bit-dynamic-debug-mode display_name: "Shared Library Enterprise RHEL 8.0 Debug Mode" + tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter run_on: - rhel80-small @@ -257,6 +258,7 @@ buildvariants: - name: &windows-debug-suggested windows-debug-suggested display_name: "* Windows DEBUG" + tags: ["suggested"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - windows-vsCurrent-small @@ -297,6 +299,7 @@ buildvariants: - name: &enterprise-windows-debug-unoptimized enterprise-windows-debug-unoptimized display_name: "Enterprise Windows DEBUG (Unoptimized)" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - windows-vsCurrent-small @@ -344,6 +347,7 @@ buildvariants: - &macos-debug-template name: &macos-debug-suggested macos-debug-suggested display_name: "* macOS DEBUG" + tags: ["suggested"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - macos-1100 @@ -372,6 +376,7 @@ buildvariants: - name: &enterprise-macos enterprise-macos display_name: "Enterprise macOS DEBUG" + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - macos-1100 @@ -408,6 +413,7 @@ buildvariants: - &rhel80-debug-ubsan-all-feature-flags-template name: &rhel80-debug-ubsan-all-feature-flags rhel80-debug-ubsan-all-feature-flags display_name: "* Shared Library UBSAN Enterprise RHEL 8.0 DEBUG (all feature flags)" + tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-build @@ -450,6 +456,7 @@ buildvariants: <<: *linux_debug_aubsan_compile_variant_dependency name: &rhel80-debug-aubsan-lite-all-feature-flags-required rhel80-debug-aubsan-lite-all-feature-flags-required display_name: "! Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG (all feature flags)" + tags: ["required"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - rhel80-build @@ -468,6 +475,7 @@ buildvariants: - <<: *rhel80-debug-aubsan-lite-all-feature-flags-required-template name: &rhel80-debug-aubsan-all-feature-flags rhel80-debug-aubsan-all-feature-flags display_name: "* Shared Library {A,UB}SAN Enterprise RHEL 8.0 DEBUG (all feature flags)" + tags: ["suggested"] cron: "0 4 * * *" # From the ${project_required_suggested_cron} parameter expansions: <<: *aubsan-lite-required-expansions @@ -486,6 +494,7 @@ buildvariants: - &enterprise-rhel80-debug-tsan-template name: &enterprise-rhel80-debug-tsan enterprise-rhel80-debug-tsan display_name: "* TSAN Enterprise RHEL 8.0 DEBUG" + tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-large @@ -630,8 +639,8 @@ buildvariants: - name: &enterprise-rhel80-unoptimized-64-bit enterprise-rhel80-unoptimized-64-bit display_name: "~ Enterprise RHEL 8.0 DEBUG (Unoptimized)" - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. expansions: compile_flags: >- MONGO_DISTMOD=rhel80 diff --git a/etc/evergreen_yml_components/variants/suse/test_release.yml b/etc/evergreen_yml_components/variants/suse/test_release.yml index f70ce581383..0075f6abcd4 100644 --- a/etc/evergreen_yml_components/variants/suse/test_release.yml +++ b/etc/evergreen_yml_components/variants/suse/test_release.yml @@ -7,6 +7,7 @@ buildvariants: - name: enterprise-suse15-64 display_name: Enterprise SLES 15 + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - suse15-test @@ -48,8 +49,8 @@ buildvariants: - name: suse15 display_name: SUSE 15 - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - suse15-test expansions: diff --git a/etc/evergreen_yml_components/variants/ubuntu/test_dev_master_and_lts_branches_only.yml b/etc/evergreen_yml_components/variants/ubuntu/test_dev_master_and_lts_branches_only.yml index 2145c7f0a5d..6df8b9832d1 100644 --- a/etc/evergreen_yml_components/variants/ubuntu/test_dev_master_and_lts_branches_only.yml +++ b/etc/evergreen_yml_components/variants/ubuntu/test_dev_master_and_lts_branches_only.yml @@ -23,8 +23,9 @@ variables: buildvariants: - <<: *enterprise-ubuntu2204-64-libvoidstar-template name: &enterprise-ubuntu2204-64-libvoidstar enterprise-ubuntu2204-64-libvoidstar - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. display_name: "~ Enterprise Ubuntu 22.04 w/ libvoidstar" + tags: [] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. expansions: <<: *enterprise-ubuntu2204-64-libvoidstar-expansions-template compile_variant: *enterprise-ubuntu2204-64-libvoidstar @@ -39,8 +40,9 @@ buildvariants: - <<: *enterprise-ubuntu2204-64-libvoidstar-template name: &enterprise-ubuntu2204-64-aubsan-libvoidstar enterprise-ubuntu2204-64-aubsan-libvoidstar - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. display_name: "~ {A,UB}SAN Enterprise Ubuntu 22.04 w/ libvoidstar" + tags: [] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. expansions: <<: *enterprise-ubuntu2204-64-libvoidstar-expansions-template antithesis_build_type: aubsan @@ -69,8 +71,9 @@ buildvariants: # TODO SERVER-83727 After a toolchain upgrade, we should add -shared-libsan - <<: *enterprise-ubuntu2204-64-libvoidstar-template name: &enterprise-ubuntu2204-64-tsan-libvoidstar enterprise-ubuntu2204-64-tsan-libvoidstar - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. display_name: "~ TSAN Enterprise Ubuntu 22.04 w/ libvoidstar" + tags: [] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. expansions: <<: *enterprise-ubuntu2204-64-libvoidstar-expansions-template antithesis_build_type: tsan diff --git a/etc/evergreen_yml_components/variants/ubuntu/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/ubuntu/test_dev_master_branch_only.yml index 1d425514b6e..6dbd38e835b 100644 --- a/etc/evergreen_yml_components/variants/ubuntu/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/ubuntu/test_dev_master_branch_only.yml @@ -7,8 +7,8 @@ buildvariants: - name: &ubuntu2204-arm64-bazel-compile ubuntu2204-arm64-bazel-compile display_name: "! Ubuntu 22.04 arm64 Enterprise Bazel Compile" + tags: ["required", "bazel_check"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter - tags: ["bazel_check"] run_on: - ubuntu2204-arm64-small stepback: false @@ -25,8 +25,8 @@ buildvariants: - name: &ubuntu2204-x86-64-bazel-compile ubuntu2204-x86-64-bazel-compile display_name: "Ubuntu 22.04 x86_64 Enterprise Bazel Compile" - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - ubuntu2204-small stepback: false diff --git a/etc/evergreen_yml_components/variants/ubuntu/test_release.yml b/etc/evergreen_yml_components/variants/ubuntu/test_release.yml index f67bd0c0f5b..ba2ea30ef68 100644 --- a/etc/evergreen_yml_components/variants/ubuntu/test_release.yml +++ b/etc/evergreen_yml_components/variants/ubuntu/test_release.yml @@ -7,8 +7,8 @@ buildvariants: - name: enterprise-ubuntu1804-64 display_name: Jepsen Tests on Enterprise Ubuntu 18.04 - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - ubuntu1804-small # TODO SERVER-86538 see if we can use --allocator=tcmalloc-google on @@ -34,6 +34,7 @@ buildvariants: - &ubuntu2204-template name: &ubuntu2204 ubuntu2204 display_name: Ubuntu 22.04 + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - ubuntu2204-small @@ -74,6 +75,7 @@ buildvariants: - <<: *ubuntu2204-template name: ubuntu2204-powercycle display_name: Ubuntu 22.04 Powercycle + tags: [] depends_on: - name: archive_dist_test_debug variant: *ubuntu2204 @@ -82,6 +84,7 @@ buildvariants: - name: ubuntu2004 display_name: Ubuntu 20.04 + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - ubuntu2004-small @@ -122,6 +125,7 @@ buildvariants: - &enterprise-ubuntu2004-64-template name: &enterprise-ubuntu2004-64 enterprise-ubuntu2004-64 display_name: Enterprise Ubuntu 20.04 + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - ubuntu2004-small @@ -169,6 +173,7 @@ buildvariants: - <<: *enterprise-ubuntu2004-64-template name: enterprise-ubuntu2004-64-security display_name: Enterprise Ubuntu 20.04 Security + tags: [] depends_on: - name: archive_dist_test_debug variant: *enterprise-ubuntu2004-64 @@ -179,8 +184,8 @@ buildvariants: - name: enterprise-ubuntu2204-64 display_name: Enterprise Ubuntu 22.04 - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - ubuntu2204-small stepback: false @@ -228,6 +233,7 @@ buildvariants: - name: enterprise-ubuntu2004-arm64 display_name: Enterprise Ubuntu 20.04 arm64 + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - ubuntu2004-arm64 @@ -271,8 +277,8 @@ buildvariants: - name: ubuntu2004-arm64 display_name: Ubuntu 20.04 arm64 - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - ubuntu2004-arm64-small expansions: @@ -313,6 +319,7 @@ buildvariants: - name: enterprise-ubuntu2204-arm64 display_name: Enterprise Ubuntu 22.04 arm64 + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - ubuntu2204-arm64-small @@ -352,8 +359,8 @@ buildvariants: - name: ubuntu2204-arm64 display_name: Ubuntu 22.04 arm64 - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - ubuntu2204-arm64-small expansions: diff --git a/etc/evergreen_yml_components/variants/windows/test_dev.yml b/etc/evergreen_yml_components/variants/windows/test_dev.yml index 528d7d230d0..f100c66f897 100644 --- a/etc/evergreen_yml_components/variants/windows/test_dev.yml +++ b/etc/evergreen_yml_components/variants/windows/test_dev.yml @@ -48,7 +48,7 @@ variables: buildvariants: - name: &windows-compile-required windows-compile-required display_name: "! Windows Enterprise Compile" - tags: ["bazel_check"] + tags: ["required", "bazel_check"] run_on: - windows-vsCurrent-xxlarge activate: true # These compile variants run on every commit to reduce latency of the auto-reverter. @@ -85,6 +85,7 @@ buildvariants: <<: *windows_compile_variant_dependency name: &enterprise-windows-suggested enterprise-windows-suggested display_name: "* Enterprise Windows" + tags: ["suggested"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - windows-vsCurrent-small diff --git a/etc/evergreen_yml_components/variants/windows/test_dev_master_and_lts_branches_only.yml b/etc/evergreen_yml_components/variants/windows/test_dev_master_and_lts_branches_only.yml index 11217d7aa81..aede804410b 100644 --- a/etc/evergreen_yml_components/variants/windows/test_dev_master_and_lts_branches_only.yml +++ b/etc/evergreen_yml_components/variants/windows/test_dev_master_and_lts_branches_only.yml @@ -7,6 +7,7 @@ buildvariants: - name: enterprise-windows-inmem display_name: Enterprise Windows (inMemory) + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - windows-vsCurrent-small diff --git a/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml index 96f297e2d05..cf438b040a6 100644 --- a/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml @@ -50,8 +50,8 @@ buildvariants: # This will eventually become suggested, then required. - name: &windows-bazel-compile windows-bazel-compile display_name: "Windows Enterprise Bazel Compile" - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - windows-vsCurrent-xlarge stepback: false @@ -74,6 +74,7 @@ buildvariants: - name: &windows-dev-compile-suggested windows-dev-compile-suggested display_name: "* Windows Enterprise Dev Compile" + tags: ["suggested"] run_on: - windows-vsCurrent-xlarge expansions: @@ -94,6 +95,7 @@ buildvariants: ### QO & QE Patch-Specific Build Variants ### - name: &windows-compile-query-patch-only windows-compile-query-patch-only display_name: "~ Windows Enterprise Compile Query Patch Only" + tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. run_on: - windows-vsCurrent-small @@ -131,6 +133,7 @@ buildvariants: <<: *windows_compile_variant_dependency name: &enterprise-windows-all-feature-flags-required enterprise-windows-all-feature-flags-required display_name: "! Enterprise Windows (all feature flags)" + tags: ["required"] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - windows-vsCurrent-small @@ -172,6 +175,7 @@ buildvariants: - name: &enterprise-windows-benchmarks enterprise-windows-benchmarks display_name: "* Enterprise Windows (Benchmarks)" + tags: ["suggested"] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - windows-vsCurrent-large # To accommodate OOD issues noted in BF-31698 @@ -210,6 +214,7 @@ buildvariants: - <<: *enterprise-windows-all-feature-flags-required-template name: &windows-compile-security-patch-only windows-compile-security-patch-only display_name: "~ Windows Security Patch Only" + tags: [] cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. expansions: <<: *windows_expansions diff --git a/etc/evergreen_yml_components/variants/windows/test_release.yml b/etc/evergreen_yml_components/variants/windows/test_release.yml index 6ac76b7cd66..bf80a4bd1af 100644 --- a/etc/evergreen_yml_components/variants/windows/test_release.yml +++ b/etc/evergreen_yml_components/variants/windows/test_release.yml @@ -7,6 +7,7 @@ buildvariants: - name: windows display_name: Windows + tags: [] cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - windows-vsCurrent-small @@ -45,8 +46,8 @@ buildvariants: - &enterprise-windows-template name: &enterprise-windows enterprise-windows display_name: "Enterprise Windows" - cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. tags: ["bazel_check"] + cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - windows-vsCurrent-small expansions: @@ -96,6 +97,7 @@ buildvariants: - <<: *enterprise-windows-template name: enterprise-windows-security display_name: Enterprise Windows Security + tags: [] depends_on: - name: archive_dist_test_debug variant: *enterprise-windows diff --git a/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml index 8a15e7ecebf..417d0075646 100644 --- a/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml @@ -51,6 +51,7 @@ buildvariants: - <<: *generic_linux_compile_params name: &linux-x86-dynamic-debug-wtdevelop-compile linux-x86-dynamic-debug-wtdevelop-compile display_name: "~ Linux WiredTiger develop DEBUG Compile" + tags: [] activate: false modules: - wtdevelop @@ -61,6 +62,7 @@ buildvariants: - name: &linux-64-debug-wtdevelop linux-64-debug-wtdevelop display_name: "~ Linux DEBUG WiredTiger develop" + tags: [] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - rhel80-medium @@ -128,6 +130,7 @@ buildvariants: - name: &enterprise-windows-wtdevelop enterprise-windows-wtdevelop display_name: "~ Enterprise Windows WiredTiger develop" + tags: [] cron: "0 */4 * * *" # From the ${project_required_suggested_cron} parameter run_on: - windows-vsCurrent-small diff --git a/evergreen/lint_yaml.sh b/evergreen/lint_yaml.sh index 90d17f8a4db..0610ce1db6c 100755 --- a/evergreen/lint_yaml.sh +++ b/evergreen/lint_yaml.sh @@ -6,7 +6,7 @@ set -o pipefail cd src activate_venv -EVERGREEN_CONFIG_FILE_PATH=${evergreen_config_file_path} ./buildscripts/yamllinters.sh | tee yamllinters.log +./buildscripts/yamllinters.sh | tee yamllinters.log exit_code=$? $python ./buildscripts/simple_report.py --test-name yamllinters --log-file yamllinters.log --exit-code $exit_code diff --git a/poetry.lock b/poetry.lock index 30637603329..a557c9d6d8f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -850,13 +850,13 @@ dev = ["black", "build", "commitizen", "isort", "pip-tools", "pre-commit", "twin [[package]] name = "evergreen-lint" -version = "0.1.5" +version = "0.1.6" description = "" optional = false -python-versions = ">=3.9,<4.0" +python-versions = "<4.0,>=3.9" files = [ - {file = "evergreen_lint-0.1.5-py3-none-any.whl", hash = "sha256:4bca2167b9a7a23f650c17fd3b01f820c92b62f802cd90e49827f89a7639a43a"}, - {file = "evergreen_lint-0.1.5.tar.gz", hash = "sha256:8048dd6c3ad809e82264291c60fa3569fe629dcd2643f58df1d3e8ce330283fd"}, + {file = "evergreen_lint-0.1.6-py3-none-any.whl", hash = "sha256:75b0605682d0382ad7cb3ed620869abf719b52fc8fb29ef77e6c4b8f1e52d343"}, + {file = "evergreen_lint-0.1.6.tar.gz", hash = "sha256:fe7a4bfdcd1c3fc02ab7bc4b566b97bdb581fb274515ae3a44e9068baebd57b3"}, ] [package.dependencies] @@ -4250,4 +4250,4 @@ libdeps = ["cxxfilt", "eventlet", "flask", "flask-cors", "gevent", "lxml", "prog [metadata] lock-version = "2.0" python-versions = ">=3.10,<4.0" -content-hash = "2f10524bd20b22be7cc6d43f0779873a4bea2776ceed176613537a8da1a9bcc5" +content-hash = "debc8cd366a28b57c54ee0eacc5174fa45172e44d6ca010edf6bfe7cfc8aa1e5" diff --git a/pyproject.toml b/pyproject.toml index e7443d8c10f..363948b7989 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -103,7 +103,7 @@ types-setuptools = "57.4.12" # latest is 68.0.0.0, but that causes pip install r types-requests = "2.31.0.1" tqdm = "*" colorama = "^0.4.6" -evergreen-lint = "^0.1.5" +evergreen-lint = "^0.1.6" [tool.poetry.group.platform.dependencies] pypiwin32 = { version = ">=223", markers = "sys_platform == 'win32'" }