From a393f8d74d11ef53b01cd627eaa36d1d468fe5c5 Mon Sep 17 00:00:00 2001 From: Basit Chonka Date: Thu, 25 Sep 2025 13:17:43 +0200 Subject: [PATCH] remove 4,5 from CI and move 6 to eol --- .evergreen/buildvariants-and-tasks.in.yml | 8 +- .evergreen/buildvariants-and-tasks.yml | 300 +--------------------- 2 files changed, 8 insertions(+), 300 deletions(-) diff --git a/.evergreen/buildvariants-and-tasks.in.yml b/.evergreen/buildvariants-and-tasks.in.yml index 1c1fa945f50..c68466a92c9 100644 --- a/.evergreen/buildvariants-and-tasks.in.yml +++ b/.evergreen/buildvariants-and-tasks.in.yml @@ -108,15 +108,11 @@ const TEST_PACKAGED_APP_BUILD_VARIANTS = [ ]; const EOL_SERVER_VERSIONS = [ - { name: '44x-community', version: '4.4.x' }, - { name: '44x-enterprise', version: '4.4.x-enterprise' }, - { name: '5x-community', version: '5.x.x' }, - { name: '5x-enterprise', version: '5.x.x-enterprise' } + { name: '60x-community', version: '6.0.x' }, + { name: '60x-enterprise', version: '6.0.x-enterprise' }, ]; const MAINTAINED_SERVER_VERSIONS = [ - { name: '60x-community', version: '6.0.x' }, - { name: '60x-enterprise', version: '6.0.x-enterprise' }, { name: '70x-community', version: '7.0.x' }, { name: '70x-enterprise', version: '7.0.x-enterprise' }, { name: '80x-community', version: '8.0.x' }, diff --git a/.evergreen/buildvariants-and-tasks.yml b/.evergreen/buildvariants-and-tasks.yml index 15a5bd0aa7b..3c09696f1e1 100644 --- a/.evergreen/buildvariants-and-tasks.yml +++ b/.evergreen/buildvariants-and-tasks.yml @@ -120,18 +120,12 @@ buildvariants: - name: package-compass variant: package-ubuntu tasks: - - name: test-server-44x-community-1 - - name: test-server-44x-community-2 - - name: test-server-44x-community-3 - - name: test-server-44x-enterprise-1 - - name: test-server-44x-enterprise-2 - - name: test-server-44x-enterprise-3 - - name: test-server-5x-community-1 - - name: test-server-5x-community-2 - - name: test-server-5x-community-3 - - name: test-server-5x-enterprise-1 - - name: test-server-5x-enterprise-2 - - name: test-server-5x-enterprise-3 + - name: test-server-60x-community-1 + - name: test-server-60x-community-2 + - name: test-server-60x-community-3 + - name: test-server-60x-enterprise-1 + - name: test-server-60x-enterprise-2 + - name: test-server-60x-enterprise-3 - name: test-maintained-servers display_name: Test Maintained Servers run_on: ubuntu2004-large @@ -140,12 +134,6 @@ buildvariants: - name: package-compass variant: package-ubuntu tasks: - - name: test-server-60x-community-1 - - name: test-server-60x-community-2 - - name: test-server-60x-community-3 - - name: test-server-60x-enterprise-1 - - name: test-server-60x-enterprise-2 - - name: test-server-60x-enterprise-3 - name: test-server-70x-community-1 - name: test-server-70x-community-2 - name: test-server-70x-community-3 @@ -510,282 +498,6 @@ tasks: - func: smoketest-on-github-actions vars: debug: compass-e2e-tests*,electron*,hadron*,mongo* - - name: test-server-44x-community-1 - tags: - - required-for-publish - - run-on-pr - commands: - - func: prepare - - func: install - - func: bootstrap - vars: - scope: compass-e2e-tests - - func: apply-compass-target-expansion - vars: - compass_distribution: compass - - func: get-packaged-app - vars: - compass_distribution: compass - - func: test-packaged-app - vars: - mongodb_version: 4.4.x - compass_distribution: compass - e2e_test_groups: 3 - e2e_test_group: 1 - debug: compass-e2e-tests*,electron*,hadron*,mongo* - - name: test-server-44x-community-2 - tags: - - required-for-publish - - run-on-pr - commands: - - func: prepare - - func: install - - func: bootstrap - vars: - scope: compass-e2e-tests - - func: apply-compass-target-expansion - vars: - compass_distribution: compass - - func: get-packaged-app - vars: - compass_distribution: compass - - func: test-packaged-app - vars: - mongodb_version: 4.4.x - compass_distribution: compass - e2e_test_groups: 3 - e2e_test_group: 2 - debug: compass-e2e-tests*,electron*,hadron*,mongo* - - name: test-server-44x-community-3 - tags: - - required-for-publish - - run-on-pr - commands: - - func: prepare - - func: install - - func: bootstrap - vars: - scope: compass-e2e-tests - - func: apply-compass-target-expansion - vars: - compass_distribution: compass - - func: get-packaged-app - vars: - compass_distribution: compass - - func: test-packaged-app - vars: - mongodb_version: 4.4.x - compass_distribution: compass - e2e_test_groups: 3 - e2e_test_group: 3 - debug: compass-e2e-tests*,electron*,hadron*,mongo* - - name: test-server-44x-enterprise-1 - tags: - - required-for-publish - - run-on-pr - commands: - - func: prepare - - func: install - - func: bootstrap - vars: - scope: compass-e2e-tests - - func: apply-compass-target-expansion - vars: - compass_distribution: compass - - func: get-packaged-app - vars: - compass_distribution: compass - - func: test-packaged-app - vars: - mongodb_version: 4.4.x-enterprise - compass_distribution: compass - e2e_test_groups: 3 - e2e_test_group: 1 - debug: compass-e2e-tests*,electron*,hadron*,mongo* - - name: test-server-44x-enterprise-2 - tags: - - required-for-publish - - run-on-pr - commands: - - func: prepare - - func: install - - func: bootstrap - vars: - scope: compass-e2e-tests - - func: apply-compass-target-expansion - vars: - compass_distribution: compass - - func: get-packaged-app - vars: - compass_distribution: compass - - func: test-packaged-app - vars: - mongodb_version: 4.4.x-enterprise - compass_distribution: compass - e2e_test_groups: 3 - e2e_test_group: 2 - debug: compass-e2e-tests*,electron*,hadron*,mongo* - - name: test-server-44x-enterprise-3 - tags: - - required-for-publish - - run-on-pr - commands: - - func: prepare - - func: install - - func: bootstrap - vars: - scope: compass-e2e-tests - - func: apply-compass-target-expansion - vars: - compass_distribution: compass - - func: get-packaged-app - vars: - compass_distribution: compass - - func: test-packaged-app - vars: - mongodb_version: 4.4.x-enterprise - compass_distribution: compass - e2e_test_groups: 3 - e2e_test_group: 3 - debug: compass-e2e-tests*,electron*,hadron*,mongo* - - name: test-server-5x-community-1 - tags: - - required-for-publish - - run-on-pr - commands: - - func: prepare - - func: install - - func: bootstrap - vars: - scope: compass-e2e-tests - - func: apply-compass-target-expansion - vars: - compass_distribution: compass - - func: get-packaged-app - vars: - compass_distribution: compass - - func: test-packaged-app - vars: - mongodb_version: 5.x.x - compass_distribution: compass - e2e_test_groups: 3 - e2e_test_group: 1 - debug: compass-e2e-tests*,electron*,hadron*,mongo* - - name: test-server-5x-community-2 - tags: - - required-for-publish - - run-on-pr - commands: - - func: prepare - - func: install - - func: bootstrap - vars: - scope: compass-e2e-tests - - func: apply-compass-target-expansion - vars: - compass_distribution: compass - - func: get-packaged-app - vars: - compass_distribution: compass - - func: test-packaged-app - vars: - mongodb_version: 5.x.x - compass_distribution: compass - e2e_test_groups: 3 - e2e_test_group: 2 - debug: compass-e2e-tests*,electron*,hadron*,mongo* - - name: test-server-5x-community-3 - tags: - - required-for-publish - - run-on-pr - commands: - - func: prepare - - func: install - - func: bootstrap - vars: - scope: compass-e2e-tests - - func: apply-compass-target-expansion - vars: - compass_distribution: compass - - func: get-packaged-app - vars: - compass_distribution: compass - - func: test-packaged-app - vars: - mongodb_version: 5.x.x - compass_distribution: compass - e2e_test_groups: 3 - e2e_test_group: 3 - debug: compass-e2e-tests*,electron*,hadron*,mongo* - - name: test-server-5x-enterprise-1 - tags: - - required-for-publish - - run-on-pr - commands: - - func: prepare - - func: install - - func: bootstrap - vars: - scope: compass-e2e-tests - - func: apply-compass-target-expansion - vars: - compass_distribution: compass - - func: get-packaged-app - vars: - compass_distribution: compass - - func: test-packaged-app - vars: - mongodb_version: 5.x.x-enterprise - compass_distribution: compass - e2e_test_groups: 3 - e2e_test_group: 1 - debug: compass-e2e-tests*,electron*,hadron*,mongo* - - name: test-server-5x-enterprise-2 - tags: - - required-for-publish - - run-on-pr - commands: - - func: prepare - - func: install - - func: bootstrap - vars: - scope: compass-e2e-tests - - func: apply-compass-target-expansion - vars: - compass_distribution: compass - - func: get-packaged-app - vars: - compass_distribution: compass - - func: test-packaged-app - vars: - mongodb_version: 5.x.x-enterprise - compass_distribution: compass - e2e_test_groups: 3 - e2e_test_group: 2 - debug: compass-e2e-tests*,electron*,hadron*,mongo* - - name: test-server-5x-enterprise-3 - tags: - - required-for-publish - - run-on-pr - commands: - - func: prepare - - func: install - - func: bootstrap - vars: - scope: compass-e2e-tests - - func: apply-compass-target-expansion - vars: - compass_distribution: compass - - func: get-packaged-app - vars: - compass_distribution: compass - - func: test-packaged-app - vars: - mongodb_version: 5.x.x-enterprise - compass_distribution: compass - e2e_test_groups: 3 - e2e_test_group: 3 - debug: compass-e2e-tests*,electron*,hadron*,mongo* - name: test-server-60x-community-1 tags: - required-for-publish