From 7fc8856f52a52fc492b13f47fb18558efc337baf Mon Sep 17 00:00:00 2001 From: Mikhail Shchatko Date: Wed, 17 May 2023 16:14:10 +0000 Subject: SERVER-73639 Avoid dependency on version_burn_in_gen for non-burn-in tasks --- etc/evergreen.yml | 99 +++++++++++++++++++--- etc/evergreen_yml_components/definitions.yml | 11 ++- .../variants/classic_engine.yml | 16 +++- 3 files changed, 111 insertions(+), 15 deletions(-) diff --git a/etc/evergreen.yml b/etc/evergreen.yml index ef7d7b46539..2a27f0bbbed 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -88,8 +88,6 @@ variables: # This is added because of EVG-18211. # Without this we are adding extra dependencies on evergreen and it is causing strain omit_generated_tasks: true - - name: version_burn_in_gen - variant: generate-tasks-for-version - &linux_x86_dynamic_debug_compile_variant_dependency depends_on: @@ -120,8 +118,6 @@ variables: # This is added because of EVG-18211. # Without this we are adding extra dependencies on evergreen and it is causing strain omit_generated_tasks: true - - name: version_burn_in_gen - variant: generate-tasks-for-version - &linux_x86_generic_expansions multiversion_platform: rhel80 @@ -189,6 +185,11 @@ variables: distros: - windows-vsCurrent-large - name: burn_in_tests_gen + depends_on: + - name: version_burn_in_gen + variant: generate-tasks-for-version + omit_generated_tasks: true + - name: archive_dist_test_debug - name: .aggfuzzer .common !.feature_flag_guarded - name: audit - name: auth_audit_gen @@ -634,6 +635,12 @@ buildvariants: external_auth_jobs_max: 1 tasks: - name: burn_in_tests_gen + depends_on: + - name: version_burn_in_gen + variant: generate-tasks-for-version + omit_generated_tasks: true + - name: archive_dist_test_debug + variant: *windows_compile_variant_name - name: audit - name: auth_audit_gen - name: causally_consistent_jscore_txns_passthrough @@ -699,7 +706,19 @@ buildvariants: - name: query_golden_classic - name: query_golden_cqf - name: burn_in_tests_gen + depends_on: + - name: version_burn_in_gen + variant: generate-tasks-for-version + omit_generated_tasks: true + - name: archive_dist_test_debug + variant: *windows_compile_variant_name # - name: burn_in_tasks_gen + # depends_on: + # - name: version_burn_in_gen + # variant: generate-tasks-for-version + # omit_generated_tasks: true + # - name: archive_dist_test_debug + # variant: *windows_compile_variant_name - name: audit - name: auth_audit_gen - name: buildscripts_test @@ -946,10 +965,14 @@ buildvariants: # This is added because of EVG-18211. # Without this we are adding extra dependencies on evergreen and it is causing strain omit_generated_tasks: true - - name: version_burn_in_gen - variant: generate-tasks-for-version tasks: - name: burn_in_tests_gen + depends_on: + - name: version_burn_in_gen + variant: generate-tasks-for-version + omit_generated_tasks: true + - name: archive_dist_test_debug + variant: *linux_x86_dynamic_compile_variant_name - name: .aggfuzzer !.feature_flag_guarded - name: .aggregation !.feature_flag_guarded - name: aggregation_repeat_queries @@ -1172,8 +1195,6 @@ buildvariants: # This is added because of EVG-18211. # Without this we are adding extra dependencies on evergreen and it is causing strain omit_generated_tasks: true - - name: version_burn_in_gen - variant: generate-tasks-for-version tasks: - name: analyze_shard_key_jscore_passthrough_gen - name: cqf @@ -1185,8 +1206,26 @@ buildvariants: - name: lint_fuzzer_sanity_patch - name: test_api_version_compatibility - name: burn_in_tests_gen + depends_on: + - name: version_burn_in_gen + variant: generate-tasks-for-version + omit_generated_tasks: true + - name: archive_dist_test_debug + variant: *linux_x86_dynamic_compile_variant_name - name: burn_in_tags_gen + depends_on: + - name: version_burn_in_gen + variant: generate-tasks-for-version + omit_generated_tasks: true + - name: archive_dist_test_debug + variant: *linux_x86_dynamic_compile_variant_name # - name: burn_in_tasks_gen + # depends_on: + # - name: version_burn_in_gen + # variant: generate-tasks-for-version + # omit_generated_tasks: true + # - name: archive_dist_test_debug + # variant: *linux_x86_dynamic_compile_variant_name - name: check_feature_flag_tags - name: check_for_todos - name: .aggfuzzer @@ -1363,8 +1402,6 @@ buildvariants: # This is added because of EVG-18211. # Without this we are adding extra dependencies on evergreen and it is causing strain omit_generated_tasks: true - - name: version_burn_in_gen - variant: generate-tasks-for-version tasks: - name: .aggfuzzer !.sbe_only - name: .aggregation !.sbe_only @@ -1402,7 +1439,19 @@ buildvariants: - name: aggregation_repeat_queries - name: audit - name: burn_in_tags_gen + depends_on: + - name: version_burn_in_gen + variant: generate-tasks-for-version + omit_generated_tasks: true + - name: archive_dist_test_debug + variant: *linux_x86_dynamic_compile_variant_name - name: burn_in_tests_gen + depends_on: + - name: version_burn_in_gen + variant: generate-tasks-for-version + omit_generated_tasks: true + - name: archive_dist_test_debug + variant: *linux_x86_dynamic_compile_variant_name - name: check_feature_flag_tags - name: check_for_todos - name: disk_wiredtiger @@ -1839,7 +1888,19 @@ buildvariants: - name: lint_fuzzer_sanity_patch - name: test_api_version_compatibility - name: burn_in_tests_gen + depends_on: + - name: version_burn_in_gen + variant: generate-tasks-for-version + omit_generated_tasks: true + - name: archive_dist_test_debug + variant: *amazon_linux2_arm64_compile_variant_name - name: burn_in_tags_gen + depends_on: + - name: version_burn_in_gen + variant: generate-tasks-for-version + omit_generated_tasks: true + - name: archive_dist_test_debug + variant: *amazon_linux2_arm64_compile_variant_name - name: check_feature_flag_tags - name: check_for_todos - name: .aggfuzzer @@ -2187,12 +2248,24 @@ buildvariants: # - name: compile_integration_and_test_parallel_stream_TG # Not passing # - name: test_api_version_compatibility # Not relevant for TSAN # - name: burn_in_tests_gen # No burn in tests needed + # depends_on: + # - name: version_burn_in_gen + # variant: generate-tasks-for-version + # omit_generated_tasks: true + # - name: archive_dist_test_debug + # variant: *enterprise-rhel80-debug-tsan - name: check_feature_flag_tags - name: .aggfuzzer !.feature_flag_guarded # - name: .aggregation !.feature_flag_guarded # Not passing - name: audit # - name: .auth # Not passing # - name: burn_in_tags_gen # No burn in tests needed + # depends_on: + # - name: version_burn_in_gen + # variant: generate-tasks-for-version + # omit_generated_tasks: true + # - name: archive_dist_test_debug + # variant: *enterprise-rhel80-debug-tsan - name: buildscripts_test # - name: unittest_shell_hang_analyzer_gen # Not passing # - name: .config_fuzzer # Not passing @@ -2850,6 +2923,12 @@ buildvariants: max_sub_suites: 15 tasks: - name: burn_in_tests_gen + depends_on: + - name: version_burn_in_gen + variant: generate-tasks-for-version + omit_generated_tasks: true + - name: archive_dist_test_debug + variant: *linux_x86_dynamic_compile_variant_name - name: .audit .patch_build - name: .sasl .patch_build - name: .encrypt .patch_build diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index a59f7ea8f77..d1b763bf16c 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -96,6 +96,9 @@ variables: depends_on: - name: version_gen variant: generate-tasks-for-version + # This is added because of EVG-18211. + # Without this we are adding extra dependencies on evergreen and it is causing strain + omit_generated_tasks: true - name: archive_dist_test_debug commands: - func: "generate resmoke tasks" @@ -105,10 +108,11 @@ variables: - &gen_burn_in_task_template name: gen_burn_in_task_template depends_on: - - name: version_gen - variant: generate-tasks-for-version - name: version_burn_in_gen variant: generate-tasks-for-version + # This is added because of EVG-18211. + # Without this we are adding extra dependencies on evergreen and it is causing strain + omit_generated_tasks: true - name: archive_dist_test_debug commands: - func: "generate resmoke tasks" @@ -175,6 +179,9 @@ variables: depends_on: - name: version_gen variant: generate-tasks-for-version + # This is added because of EVG-18211. + # Without this we are adding extra dependencies on evergreen and it is causing strain + omit_generated_tasks: true - archive_dist_test_debug commands: - func: "generate resmoke tasks" diff --git a/etc/evergreen_yml_components/variants/classic_engine.yml b/etc/evergreen_yml_components/variants/classic_engine.yml index d599b433be1..dc6dedfb143 100644 --- a/etc/evergreen_yml_components/variants/classic_engine.yml +++ b/etc/evergreen_yml_components/variants/classic_engine.yml @@ -71,14 +71,12 @@ buildvariants: burn_in_tag_compile_task_dependency: archive_dist_test_debug depends_on: - name: archive_dist_test_debug - variant: linux-x86-dynamic-compile + variant: *linux_x86_dynamic_compile_variant_name - name: version_gen variant: generate-tasks-for-version # This is added because of EVG-18211. # Without this we are adding extra dependencies on evergreen and it is causing strain omit_generated_tasks: true - - name: version_burn_in_gen - variant: generate-tasks-for-version tasks: - name: .aggfuzzer !.sbe_only - name: .aggregation !.sbe_only @@ -116,7 +114,19 @@ buildvariants: - name: aggregation_repeat_queries - name: audit - name: burn_in_tags_gen + depends_on: + - name: version_burn_in_gen + variant: generate-tasks-for-version + omit_generated_tasks: true + - name: archive_dist_test_debug + variant: *linux_x86_dynamic_compile_variant_name - name: burn_in_tests_gen + depends_on: + - name: version_burn_in_gen + variant: generate-tasks-for-version + omit_generated_tasks: true + - name: archive_dist_test_debug + variant: *linux_x86_dynamic_compile_variant_name - name: check_feature_flag_tags - name: check_for_todos - name: disk_wiredtiger -- cgit v1.2.1