From 7e4cd4c67462a2ac4889d22e180c4778ba02c46f Mon Sep 17 00:00:00 2001 From: Andrew Bradshaw Date: Wed, 1 Apr 2026 09:04:25 -0700 Subject: [PATCH] SERVER-123050 Remove AL2 variants (#50806) GitOrigin-RevId: 32a0506b341c46bbe3dc4188a29cdbf406543eda --- .../variants/amazon/test_release.yml | 214 ------------------ .../variants/mongot/test_dev.yml | 125 ---------- etc/extensions.yml | 8 - 3 files changed, 347 deletions(-) diff --git a/etc/evergreen_yml_components/variants/amazon/test_release.yml b/etc/evergreen_yml_components/variants/amazon/test_release.yml index 5be0db3d19f..253f8fe67d1 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_release.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_release.yml @@ -5,220 +5,6 @@ # and LTS release (v7.0, v6.0 etc.) branch projects buildvariants: - - name: amazon2 - display_name: "Amazon Linux 2" - cron: "0 3 * * *" # From the ${project_nightly_cron} parameter. - run_on: - - amazon2-latest-small - expansions: - # TODO SERVER-119677: Remove use_python310 once Amazon2 sqlite is upgraded - use_python310: true - test_flags: >- - --excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux,requires_external_data_source - --modules=none - push_path: linux - push_bucket: downloads.mongodb.org - push_bucket_new: cdn-origin-mongodb-server-community - push_role_arn: arn:aws:iam::119629040606:role/s3-access.cdn-origin-mongodb-server-community - push_name: linux - push_arch: x86_64-amazon2 - mciuploads_binary_permissions_push: public-read - mciuploads_binary_visibility_push: public - bazel_compile_flags: >- - --define=MONGO_DISTMOD=amazon2 - --build_enterprise=False - compile_all_but_not_unittests_flags: >- - --linkopt=-s - multiversion_platform: amazon2 - multiversion_edition: targeted - has_packages: true - packager_script: packager.py - packager_arch: x86_64 - packager_distro: amazon2 - repo_edition: org - large_distro_name: amazon2-latest-large - compile_variant: amazon2 - tasks: - - name: compile_test_and_package_serial_TG - distros: - - amazon2-latest-large - - name: run_unit_tests_TG - distros: - - amazon2-latest-large - - name: test_packages - distros: - - ubuntu2204-large - - name: .development_critical !.incompatible_community !.requires_large_host - - name: .development_critical !.incompatible_community .requires_large_host - distros: - - amazon2-latest-large - - name: .release_critical !.incompatible_community !.requires_large_host - - name: .release_critical !.incompatible_community .requires_large_host - distros: - - amazon2-latest-large - - - name: enterprise-amazon2 - display_name: "Enterprise Amazon Linux 2" - cron: "0 3 * * *" # From the ${project_nightly_cron} parameter. - run_on: - - amazon2-latest-small - tags: ["emergency_release"] - expansions: - # TODO SERVER-119677: Remove use_python310 once Amazon2 sqlite is upgraded - use_python310: true - additional_package_targets: >- - archive-mongocryptd-stripped - archive-mongocryptd-debug - test_flags: >- - --excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux,requires_external_data_source,requires_ldap_pool - push_path: linux - push_bucket: downloads.10gen.com - push_bucket_new: cdn-origin-mongodb-server-enterprise - push_role_arn: arn:aws:iam::119629040606:role/s3-access.cdn-origin-mongodb-server-enterprise - push_name: linux - push_arch: x86_64-enterprise-amazon2 - mciuploads_binary_permissions_push: public-read - mciuploads_binary_visibility_push: public - bazel_compile_flags: >- - --define=MONGO_DISTMOD=amazon2 - compile_all_but_not_unittests_flags: >- - --linkopt=-s - multiversion_platform: amazon2 - multiversion_edition: enterprise - has_packages: true - packager_script: packager_enterprise.py - packager_arch: x86_64 - packager_distro: amazon2 - repo_edition: enterprise - compile_variant: enterprise-amazon2 - core_analyzer_distro_name: amazon2-latest-large - large_distro_name: amazon2-latest-large - tasks: - - name: compile_test_and_package_serial_TG - distros: - - amazon2-latest-c6i-32xlarge - - name: run_unit_tests_TG - distros: - - amazon2-latest-c6i-32xlarge - - name: test_packages - distros: - - ubuntu2204-large - - name: .development_critical !.requires_large_host - - name: .development_critical .requires_large_host - distros: - - amazon2-latest-large - - name: .release_critical !.requires_large_host - - name: .release_critical .requires_large_host - distros: - - amazon2-latest-large - - - name: amazon2-arm64 - display_name: "Amazon Linux 2 arm64" - cron: "0 3 * * *" # From the ${project_nightly_cron} parameter. - run_on: - - amazon2-arm64-latest-m8g-xlarge - expansions: - # TODO SERVER-119677: Remove use_python310 once Amazon2 sqlite is upgraded - use_python310: true - test_flags: >- - --excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux,requires_external_data_source - --modules=none - push_path: linux - push_bucket: downloads.mongodb.org - push_bucket_new: cdn-origin-mongodb-server-community - push_role_arn: arn:aws:iam::119629040606:role/s3-access.cdn-origin-mongodb-server-community - push_name: linux - push_arch: aarch64-amazon2 - mciuploads_binary_permissions_push: public-read - mciuploads_binary_visibility_push: public - bazel_compile_flags: >- - --define=MONGO_DISTMOD=amazon2 - --build_enterprise=False - compile_all_but_not_unittests_flags: >- - --linkopt=-s - multiversion_platform: amazon2 - multiversion_edition: targeted - has_packages: true - packager_script: packager.py - packager_arch: aarch64 - packager_distro: amazon2 - repo_edition: org - large_distro_name: amazon2-arm64-latest-m8g-4xlarge - compile_variant: amazon2-arm64 - tasks: - - name: compile_test_and_package_serial_no_unittests_TG - distros: - - amazon2-arm64-latest-m8g-4xlarge - - name: run_unit_tests_TG - distros: - - amazon2-arm64-latest-m8g-4xlarge - - name: test_packages - distros: - - ubuntu2204-arm64-m8g-4xlarge - - name: .development_critical !.incompatible_community !.requires_large_host - - name: .development_critical !.incompatible_community .requires_large_host - distros: - - amazon2-arm64-latest-m8g-4xlarge - - name: .release_critical !.incompatible_community !.requires_large_host - - name: .release_critical !.incompatible_community .requires_large_host - distros: - - amazon2-arm64-latest-m8g-4xlarge - - - name: enterprise-amazon2-arm64 - display_name: "Enterprise Amazon Linux 2 arm64" - cron: "0 3 * * *" # From the ${project_nightly_cron} parameter. - run_on: - - amazon2-arm64-latest-m8g-xlarge - tags: ["emergency_release"] - expansions: - # TODO SERVER-119677: Remove use_python310 once Amazon2 sqlite is upgraded - use_python310: true - additional_package_targets: >- - archive-mongocryptd-stripped - archive-mongocryptd-debug - test_flags: >- - --excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux,requires_external_data_source,requires_ldap_pool - push_path: linux - push_bucket: downloads.10gen.com - push_bucket_new: cdn-origin-mongodb-server-enterprise - push_role_arn: arn:aws:iam::119629040606:role/s3-access.cdn-origin-mongodb-server-enterprise - push_name: linux - push_arch: aarch64-enterprise-amazon2 - mciuploads_binary_permissions_push: public-read - mciuploads_binary_visibility_push: public - bazel_compile_flags: >- - --define=MONGO_DISTMOD=amazon2 - compile_all_but_not_unittests_flags: >- - --linkopt=-s - multiversion_platform: amazon2 - multiversion_edition: enterprise - has_packages: true - packager_script: packager_enterprise.py - packager_arch: aarch64 - packager_distro: amazon2 - repo_edition: enterprise - compile_variant: enterprise-amazon2-arm64 - core_analyzer_distro_name: amazon2-arm64-latest-m8g-4xlarge - large_distro_name: amazon2-arm64-latest-m8g-4xlarge - tasks: - - name: compile_test_and_package_serial_no_unittests_TG - distros: - - amazon2-arm64-latest-m8g-16xlarge - - name: run_unit_tests_TG - distros: - - amazon2-arm64-latest-m8g-16xlarge - - name: test_packages - distros: - - ubuntu2204-arm64-m8g-4xlarge - - name: .development_critical !.requires_large_host - - name: .development_critical .requires_large_host - distros: - - amazon2-arm64-latest-m8g-4xlarge - - name: .release_critical !.requires_large_host - - name: .release_critical .requires_large_host - distros: - - amazon2-arm64-latest-m8g-4xlarge - - name: amazon2023 display_name: Amazon Linux 2023.3 tags: ["bazel_check", "forbid_tasks_tagged_with_experimental"] diff --git a/etc/evergreen_yml_components/variants/mongot/test_dev.yml b/etc/evergreen_yml_components/variants/mongot/test_dev.yml index f3b24d0c4f6..4f64287f7e7 100644 --- a/etc/evergreen_yml_components/variants/mongot/test_dev.yml +++ b/etc/evergreen_yml_components/variants/mongot/test_dev.yml @@ -140,131 +140,6 @@ buildvariants: compile_variant: amazon2023-arm64-mongot-integration-patchable tasks: *amazon2023-arm64-mongot-distro-tasks - # This variant is responsible for creating a AL2 arm64 server binary candidate for 10gen/mongot. - # A project trigger defined on 10gen/mongot runs when this variant succeeds, to check if the resulting - # 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 1,5,9,13,17,21 * * *" # Run these tasks every 4 hours - patchable: false - run_on: - - amazon2-arm64-latest-m8g-xlarge - stepback: true - expansions: &amazon-linux2-arm64-mongot-integration-expansions - mciuploads_binary_permissions: public-read - mciuploads_binary_visibility: public - build_mongot: true - bazel_compile_flags: >- - --define=MONGO_DISTMOD=amazon2 - has_packages: false - target_resmoke_time: 10 - max_sub_suites: 5 - idle_timeout_factor: 1.5 - exec_timeout_factor: 1.5 - compile_variant: amazon-linux2-arm64-mongot-integration-cron-only - tasks: &amazon-linux2-arm64-mongot-distro-tasks - - name: compile_and_archive_dist_test_TG - distros: - - amazon2-arm64-latest-m8g-4xlarge - # downstream_expansions.set() is noop for evergreen versions, so fine to define in cron-only variants for sake of shared yaml anchor. - - name: set_downstream_expansions_for_mongot - - name: .mongot_e2e_tests !.requires_large_host !.incompatible_amazon_linux2 - - name: .mongot_e2e_tests .requires_large_host !.incompatible_amazon_linux2 - distros: - - amazon2-arm64-latest-m8g-4xlarge - # TODO SERVER-89721 remove search suites that use mongot mock. - - name: search - distros: - - amazon2-arm64-latest-m8g-4xlarge - - name: search_auth - distros: - - amazon2-arm64-latest-m8g-4xlarge - - name: search_community - distros: - - amazon2-arm64-latest-m8g-4xlarge - - name: search_community_ssl - distros: - - amazon2-arm64-latest-m8g-4xlarge - - name: search_no_pinned_connections_auth - - name: search_ssl - - name: vector_search - - name: vector_search_auth - - name: vector_search_ssl - - # This mongot integration variant is identical to the AL2 arm64 above except it is patachable - # and is not configured with any downstream project triggers on 10gen/mongot. - - name: amazon-linux2-arm64-mongot-integration-patchable - display_name: "AL2 arm64 mongot integration tasks" - tags: ["mongot_e2e"] - patch_only: true - run_on: - - amazon2-arm64-latest-m8g-xlarge - stepback: true - expansions: - <<: *amazon-linux2-arm64-mongot-integration-expansions - compile_variant: amazon-linux2-arm64-mongot-integration-patchable - tasks: *amazon-linux2-arm64-mongot-distro-tasks - - # This variant is responsible for creating a AL2 x86 server binary candidate for 10gen/mongot. - # A project trigger defined on 10gen/mongot runs when this variant succeeds, to check if the resulting - # 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 1,5,9,13,17,21 * * *" # Run these tasks every 4 hours - patchable: false - run_on: - - amazon2-latest-large - expansions: &amazon2-x86-mongot-integration-expansions - mciuploads_binary_permissions: public-read - mciuploads_binary_visibility: public - build_mongot: true - bazel_compile_flags: >- - --define=MONGO_DISTMOD=amazon2 - test_flags: >- - --excludeWithAnyTags=incompatible_with_amazon_linux,requires_ldap_pool,requires_external_data_source - --runAllFeatureFlagTests - has_packages: false - multiversion_platform: amazon2 - multiversion_edition: enterprise - multiversion_architecture: x86_64 - packager_script: packager_enterprise.py - packager_arch: x86_64 - packager_distro: amazon2 - repo_edition: enterprise - compile_variant: amazon2-x86-mongot-integration-cron-only - tasks: &amazon2-x86-mongot-distro-tasks - - name: compile_and_archive_dist_test_TG - distros: - - amazon2-latest-large - # downstream_expansions.set() is noop for evergreen versions, so fine to define in cron-only variants for sake of shared yaml anchor. - - name: set_downstream_expansions_for_mongot - - name: .mongot_e2e_tests !.incompatible_amazon_linux2 - # TODO SERVER-89721 remove search suites that use mongot mock. - - name: search - - name: search_community - - name: search_community_ssl - - name: search_auth - - name: search_no_pinned_connections_auth - - name: search_ssl - - name: vector_search - - name: vector_search_auth - - name: vector_search_ssl - - # This mongot integration variant is identical to the AL2 x86 above except it is patachable - # and is not configured with any downstream project triggers on 10gen/mongot - - name: amazon2-x86-mongot-integration-patchable - display_name: "AL2 x86 mongot integration tasks" - tags: ["mongot_e2e"] - cron: "0 1,5,9,13,17,21 * * *" # Run these tasks every 4 hours - run_on: - - amazon2-latest-large - expansions: - <<: *amazon2-x86-mongot-integration-expansions - compile_variant: amazon2-x86-mongot-integration-patchable - tasks: *amazon2-x86-mongot-distro-tasks - # This RHEL variant runs search integration tests against latest/HEAD of 10gen/mongot. It is not # configured with any project trigger on mongot. - name: &enterprise-rhel-8-64-mongot-integration enterprise-rhel-8-64-mongot-integration diff --git a/etc/extensions.yml b/etc/extensions.yml index 31aa73b8f2e..b9ee20d3a7d 100644 --- a/etc/extensions.yml +++ b/etc/extensions.yml @@ -3,8 +3,6 @@ # Artifact URI is {base_url}{name}-{version}-{variant}.tgz # # Example: for artifacts at -# - https://mongot-extension.s3.amazonaws.com/release/mongot-extension-0.0.0-amazon2-x86_64.tgz -# - https://mongot-extension.s3.amazonaws.com/release/mongot-extension-0.0.0-amazon2-aarch64.tgz # - https://mongot-extension.s3.amazonaws.com/release/mongot-extension-0.0.0-amazon2023-x86_64.tgz # - https://mongot-extension.s3.amazonaws.com/release/mongot-extension-0.0.0-amazon2023-aarch64.tgz # @@ -12,8 +10,6 @@ # name: mongot-extension # version: 0.0.0 # variants: -# amazon2-x86_64: checksum1 -# amazon2-aarch64: checksum2 # amazon2023-x86_64: checksum3 # amazon2023-aarch64: checksum4 @@ -23,8 +19,6 @@ extensions: name: mongot-extension version: 1.0.2 variants: - amazon2-x86_64: f3adacd3cb567341f9bf7d92377058e9ec4b828f7bb1460fa928f49a89b605d2 - amazon2-aarch64: 75c1932ac0c9ac1804e4c4bf5941ba505f74bf7093881b095c6d50d9724bc86f amazon2023-x86_64: b58754484e0550f92285e8d8672fe732327ea547b22b868658a90568330db0da amazon2023-aarch64: 376926c56702f7bf8bd425f3afa3f1a71599def589243fade5e7e058bc2af0a0 rerank_extension: @@ -32,7 +26,5 @@ extensions: name: rerank-extension version: 1.0.2 variants: - amazon2-x86_64: 8e24d2373c7712c16f6e3d06009fe7f0b0abbc4fd06214550c1895c57b2c2ef4 - amazon2-aarch64: 8091747bae581f39e68a03674ab1faab08c3e671f2790b49d0a02d22efc9f23a amazon2023-x86_64: de1cbb24ff45256aaca1366a7660653d1b478ff45937f2b973dac677ca0bc25a amazon2023-aarch64: aa99aef8959d3b4f50c216b938cf21c7cffc778240fea9ade75e218e26b5caf6