From e9f8be2cdbd75a8a0a622a21559b26143792d5a2 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Wed, 26 Mar 2025 16:19:28 +0000 Subject: [PATCH] Use mongodb version 8.0.5 on macOS versions < 14 --- .evergreen/buildvariants-and-tasks.in.yml | 30 ++++++++ .evergreen/buildvariants-and-tasks.yml | 87 +++++++++++++++++++++-- .github/workflows/test-installers.yml | 4 ++ 3 files changed, 115 insertions(+), 6 deletions(-) diff --git a/.evergreen/buildvariants-and-tasks.in.yml b/.evergreen/buildvariants-and-tasks.in.yml index c78bf6a7132..e320f5b8f1a 100644 --- a/.evergreen/buildvariants-and-tasks.in.yml +++ b/.evergreen/buildvariants-and-tasks.in.yml @@ -248,8 +248,12 @@ buildvariants: variant: <%= buildVariant.depends_on %> tasks: <% for (const group of E2E_TEST_GROUPS) { %> + <% if (['test-packaged-app-macos-11-arm', 'test-packaged-app-macos-11-x64'].includes(buildVariant.name)) { %> + - name: test-packaged-app-macos13-<%= group.number %> + <% } else { %> - name: test-packaged-app-<%= group.number %> <% } %> + <% } %> <% } %> - name: publish @@ -501,6 +505,32 @@ tasks: e2e_test_groups: <%= E2E_TEST_GROUPS.length %> e2e_test_group: <%= group.number %> debug: 'compass-e2e-tests*,electron*,hadron*,mongo*' + + - name: test-packaged-app-macos13-<%= group.number %> + tags: + - required-for-publish + - run-on-pr + - assigned_to_jira_team_compass_compass + - foliage_check_task_only + 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: 8.0.5 + compass_distribution: compass + e2e_test_groups: <%= E2E_TEST_GROUPS.length %> + e2e_test_group: <%= group.number %> + debug: 'compass-e2e-tests*,electron*,hadron*,mongo*' <% } %> <% for (const browser of BROWSERS) { %> diff --git a/.evergreen/buildvariants-and-tasks.yml b/.evergreen/buildvariants-and-tasks.yml index 42a7e688a3a..342b082b6e1 100644 --- a/.evergreen/buildvariants-and-tasks.yml +++ b/.evergreen/buildvariants-and-tasks.yml @@ -222,9 +222,9 @@ buildvariants: - name: package-compass variant: package-macos-arm tasks: - - name: test-packaged-app-1 - - name: test-packaged-app-2 - - name: test-packaged-app-3 + - name: test-packaged-app-macos13-1 + - name: test-packaged-app-macos13-2 + - name: test-packaged-app-macos13-3 - name: test-packaged-app-macos-11-x64 display_name: Test Packaged App MacOS x64 11 run_on: macos-11-gui @@ -233,9 +233,9 @@ buildvariants: - name: package-compass variant: package-macos-x64 tasks: - - name: test-packaged-app-1 - - name: test-packaged-app-2 - - name: test-packaged-app-3 + - name: test-packaged-app-macos13-1 + - name: test-packaged-app-macos13-2 + - name: test-packaged-app-macos13-3 - name: test-packaged-app-macos-14-arm display_name: Test Packaged App MacOS arm64 14 run_on: macos-14-arm64-gui @@ -1577,6 +1577,31 @@ tasks: e2e_test_groups: 3 e2e_test_group: 1 debug: compass-e2e-tests*,electron*,hadron*,mongo* + - name: test-packaged-app-macos13-1 + tags: + - required-for-publish + - run-on-pr + - assigned_to_jira_team_compass_compass + - foliage_check_task_only + 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: 8.0.5 + compass_distribution: compass + e2e_test_groups: 3 + e2e_test_group: 1 + debug: compass-e2e-tests*,electron*,hadron*,mongo* - name: test-packaged-app-2 tags: - required-for-publish @@ -1602,6 +1627,31 @@ tasks: e2e_test_groups: 3 e2e_test_group: 2 debug: compass-e2e-tests*,electron*,hadron*,mongo* + - name: test-packaged-app-macos13-2 + tags: + - required-for-publish + - run-on-pr + - assigned_to_jira_team_compass_compass + - foliage_check_task_only + 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: 8.0.5 + compass_distribution: compass + e2e_test_groups: 3 + e2e_test_group: 2 + debug: compass-e2e-tests*,electron*,hadron*,mongo* - name: test-packaged-app-3 tags: - required-for-publish @@ -1627,6 +1677,31 @@ tasks: e2e_test_groups: 3 e2e_test_group: 3 debug: compass-e2e-tests*,electron*,hadron*,mongo* + - name: test-packaged-app-macos13-3 + tags: + - required-for-publish + - run-on-pr + - assigned_to_jira_team_compass_compass + - foliage_check_task_only + 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: 8.0.5 + compass_distribution: compass + e2e_test_groups: 3 + e2e_test_group: 3 + debug: compass-e2e-tests*,electron*,hadron*,mongo* - name: test-web-sandbox-chrome-1 tags: - required-for-publish diff --git a/.github/workflows/test-installers.yml b/.github/workflows/test-installers.yml index 9c22e467370..2725394922b 100644 --- a/.github/workflows/test-installers.yml +++ b/.github/workflows/test-installers.yml @@ -229,6 +229,10 @@ jobs: DISTRO_ID: ${{ matrix.distro-id }} # Exposing token to prevent update server from being rate limited GITHUB_TOKEN: ${{ github.token }} + # mongodb 8.0.6 requires macOS 14+. Just use an older version for now + # so it will run on GitHub's mac runners + MONGODB_VERSION: "8.0.5" + MONGODB_RUNNER_VERSION: "8.0.5" working-directory: packages/compass-smoke-tests # Using --skipUninstalling --skipCleanup because the runners are ephemeral run: npm start -- --package ${{ matrix.package }} --tests ${{ matrix.test }} --skipUninstall --skipCleanup