Merge remote-tracking branch 'origin/main' into beta-releases

Author: github-actions[bot]

.evergreen/buildvariants-and-tasks.in.yml

@@ -27,57 +27,66 @@ const PACKAGE_BUILD_VARIANTS = [
   {
     name: 'package-ubuntu',
     display_name: 'Package Ubuntu',
+
+    // # NOTE: We are packaging on Ubuntu 16.04 in order to use glibc 2.23
+    // # when compiling/re-building addons. This ensures compatibility with other
+    // # debian platforms that have glibc 2.23 or newer.
     run_on: 'ubuntu1604-large',
+    silk_asset_group: 'compass-ubuntu',
   },
   {
     name: 'package-windows',
     display_name: 'Package Windows',
     run_on: 'windows-vsCurrent-large',
+    silk_asset_group: 'compass-windows',
   },
   {
     name: 'package-rhel',
     display_name: 'Package RHEL',
     run_on: 'rhel80-large',
+    silk_asset_group: 'compass-rhel',
   },
   {
     name: 'package-macos-x64',
     display_name: 'Package MacOS Intel',
-    run_on: 'macos-1100'
+    run_on: 'macos-1100',
+    silk_asset_group: 'compass-macos',
   },
   {
     name: 'package-macos-arm',
     display_name: 'Package MacOS Arm64',
-    run_on: 'macos-1100-arm64'
+    run_on: 'macos-1100-arm64',
+    silk_asset_group: 'compass-macos-arm',
   }
 ];
 
 const TEST_PACKAGED_APP_BUILD_VARIANTS = [
   {
-    name: 'test-packaged-app-ubuntu',
+    name: 'test-server-ubuntu',
     display_name: 'Ubuntu 20.04',
     run_on: 'ubuntu2004-large',
     depends_on: 'package-ubuntu',
   },
   {
-    name: 'test-packaged-app-windows',
+    name: 'test-server-windows',
     display_name: 'Windows 10',
     run_on: 'windows-vsCurrent-large',
     depends_on: 'package-windows',
   },
   {
-    name: 'test-packaged-app-rhel',
+    name: 'test-server-rhel',
     display_name: 'RHEL 8.0',
     run_on: 'rhel80-large',
     depends_on: 'package-rhel',
   },
   {
-    name: 'test-packaged-app-macos-11-arm',
+    name: 'test-server-macos-11-arm',
     display_name: 'MacOS arm64 11',
     run_on: 'macos-1100-arm64-gui',
     depends_on: 'package-macos-arm'
   },
   {
-    name: 'test-packaged-app-macos-11-x64',
+    name: 'test-server-macos-11-x64',
     display_name: 'MacOS x64 11',
     run_on: 'macos-1100-gui',
     patchable: false,
@@ -96,8 +105,6 @@ const EOL_SERVER_VERSIONS = [
   { name: '5x-enterprise', version: '5.x.x-enterprise' }
 ];
 
-// NOTE: the order matters here. The latest element of this array is used
-// to test the packaged app.
 const MAINTAINED_SERVER_VERSIONS = [
   { name: '60x-community', version: '6.0.x' },
   { name: '60x-enterprise', version: '6.0.x-enterprise' },
@@ -116,44 +123,17 @@ const SERVER_VERSIONS = [
 ];
 
 const COMPASS_DISTRIBUTIONS = ["compass", "compass-isolated", "compass-readonly"];
+
+const BROWSERS = ["chrome", "firefox"];
+
+const E2E_TEST_GROUPS_NUMBER = 3;
+const E2E_TEST_GROUPS = Array.from({ length: E2E_TEST_GROUPS_NUMBER }).map((_, i) => ({number: i + 1}));
 %>
 
 #
 # Build Variants
 #
 buildvariants:
-  - name: connectivity-tests
-
-    display_name: Connectivity Tests
-    run_on: ubuntu2004-large
-    tasks:
-      - name: test-connectivity
-
-  - name: generate-vulnerability-report
-    display_name: Vulnerability Report
-    run_on: ubuntu2004-large
-    tasks:
-      - name: generate-vulnerability-report
-
-  - name: coverage
-    display_name: E2E Coverage
-    run_on: ubuntu2004-large
-    tasks:
-      - name: e2e-coverage
-
-  - name: csfle-tests
-    display_name: CSFLE Tests
-    run_on: ubuntu2004-large
-    tasks:
-      - name: test-csfle
-
-  - name: test-web-sandbox
-    display_name: Test Web Sandbox
-    run_on: ubuntu2004-large
-    tasks:
-      - name: test-web-sandbox-chrome
-      - name: test-web-sandbox-firefox
-
   - name: check
     display_name: Check
     run_on: ubuntu2004-large
@@ -177,7 +157,8 @@ buildvariants:
   # package
 <% for (const buildVariant of PACKAGE_BUILD_VARIANTS) { %>
   - name: <%= buildVariant.name %>
-
+    expansions:
+      silk_asset_group: <%= buildVariant.silk_asset_group %>
     display_name: <%= buildVariant.display_name %>
     run_on: <%= buildVariant.run_on %>
     tasks:
@@ -194,9 +175,11 @@ buildvariants:
       - name: package-compass
         variant: package-ubuntu
     tasks:
-      <% for (const serverVersion of EOL_SERVER_VERSIONS) { %>
-      - name: test-packaged-app-<%= serverVersion.name %>
-      <% } %>
+    <% for (const serverVersion of EOL_SERVER_VERSIONS) { %>
+    <% for (const group of E2E_TEST_GROUPS) { %>
+    - name: test-server-<%= serverVersion.name %>-<%= group.number %>
+    <% } %>
+    <% } %>
 
   - name: test-maintained-servers
     display_name: Test Maintained Servers
@@ -206,9 +189,11 @@ buildvariants:
       - name: package-compass
         variant: package-ubuntu
     tasks:
-      <% for (const serverVersion of MAINTAINED_SERVER_VERSIONS) { %>
-      - name: test-packaged-app-<%= serverVersion.name %>
-      <% } %>
+    <% for (const serverVersion of MAINTAINED_SERVER_VERSIONS) { %>
+    <% for (const group of E2E_TEST_GROUPS) { %>
+    - name: test-server-<%= serverVersion.name %>-<%= group.number %>
+    <% } %>
+    <% } %>
 
   - name: test-latest-alpha
     display_name: Test Latest Alpha Server
@@ -218,7 +203,10 @@ buildvariants:
       - name: package-compass
         variant: package-ubuntu
     tasks:
-      - name: test-packaged-app-<%= TEST_LATEST_ALPHA_SERVER_VERSION.name %>
+    <% for (const group of E2E_TEST_GROUPS) { %>
+    - name: test-server-<%= TEST_LATEST_ALPHA_SERVER_VERSION.name %>-<%= group.number %>
+    <% } %>
+
 
   # test-packaged-app
 <% for (const buildVariant of TEST_PACKAGED_APP_BUILD_VARIANTS) { %>
@@ -230,7 +218,9 @@ buildvariants:
       - name: package-compass
         variant: <%= buildVariant.depends_on %>
     tasks:
-      - name: test-packaged-app-<%= MAINTAINED_SERVER_VERSIONS[MAINTAINED_SERVER_VERSIONS.length - 1].name %>
+    <% for (const group of E2E_TEST_GROUPS) { %>
+    - name: test-packaged-app-<%= group.number %>
+    <% } %>
 <% } %>
 
   - name: publish
@@ -242,6 +232,42 @@ buildvariants:
       - name: publish-dev-release-info
       - name: create_static_analysis_report
 
+  - name: connectivity-tests
+    display_name: Connectivity Tests
+    run_on: ubuntu2004-large
+    tasks:
+      - name: test-connectivity
+
+  - name: e2e-coverage
+    display_name: E2E Coverage
+    run_on: ubuntu2004-large
+    tasks:
+    <% for(const group of E2E_TEST_GROUPS) { %>
+    - name: e2e-coverage-<%= group.number %>
+    <% } %>
+
+  - name: csfle-tests
+    display_name: CSFLE Tests
+    run_on: ubuntu2004-large
+    tasks:
+      - name: test-csfle
+
+  - name: test-web-sandbox
+    display_name: Test Web Sandbox
+    run_on: ubuntu2004-large
+    tasks:
+    <% for (const browser of BROWSERS) { %>
+    <% for(const group of E2E_TEST_GROUPS) { %>
+    - name: test-web-sandbox-<%= browser %>-<%= group.number %>
+    <% } %>
+    <% } %>
+
+  - name: generate-vulnerability-report
+    display_name: Vulnerability Report
+    run_on: ubuntu2004-large
+    tasks:
+      - name: generate-vulnerability-report
+
 #
 # Tasks
 #
@@ -292,15 +318,19 @@ tasks:
         vars:
           debug: 'compass*,electron*,hadron*,mongo*'
 
-  - name: e2e-coverage
-    tags: ['run-on-pr']
+<% for(const group of E2E_TEST_GROUPS) { %>
+  - name: e2e-coverage-<%= group.number %>
+    tags: ['required-for-publish', 'run-on-pr']
     commands:
       - func: prepare
       - func: install
       - func: bootstrap
       - func: e2e-coverage
         vars:
+          e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
+          e2e_test_group: <%= group.number %>
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
+<% } %>
 
   - name: generate-vulnerability-report
     tags: ['required-for-publish', 'run-on-pr']
@@ -350,26 +380,35 @@ tasks:
       - func: prepare
       - func: publish-dev-release-info
 
-  - name: test-web-sandbox-chrome
-    tags: ['required-for-publish', 'run-on-pr']
+<% for (const distribution of COMPASS_DISTRIBUTIONS) { %>
+  - name: package-<%= distribution %>
+    tags: ['required-for-publish', 'run-on-pr', 'package-task']
     commands:
       - func: prepare
       - func: install
       - func: bootstrap
         vars:
-          scope: 'compass-e2e-tests'
+          scope: '@mongodb-js/webpack-config-compass'
       - func: apply-compass-target-expansion
         vars:
-          compass_distribution: compass
-      - func: test-web-sandbox
+          compass_distribution: <%= distribution %>
+      - func: spawn-signing-server
+      - func: package
         vars:
-          mongodb_version: 'latest-alpha-enterprise'
-          browser_name: 'chrome'
-          compass_distribution: compass
-          debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
+          debug: 'hadron*,mongo*,compass*,electron*,sign*'
+          compass_distribution: <%= distribution %>
+      - func: verify-artifacts
+      - func: save-all-artifacts
+        vars:
+          compass_distribution: <%= distribution %>
+<% } %>
 
-  - name: test-web-sandbox-firefox
-    tags: ['required-for-publish', 'run-on-pr']
+<% for (const serverVersion of SERVER_VERSIONS) { %>
+  <% for(const group of E2E_TEST_GROUPS) { %>
+  - name: test-server-<%= serverVersion.name %>-<%= group.number %>
+    tags:
+    - required-for-publish
+    - run-on-pr
     commands:
       - func: prepare
       - func: install
@@ -379,42 +418,49 @@ tasks:
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: test-web-sandbox
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
         vars:
-          mongodb_version: 'latest-alpha-enterprise'
-          browser_name: 'firefox'
+          mongodb_version: '<%= serverVersion.version %>'
           compass_distribution: compass
+          e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
+          e2e_test_group: <%= group.number %>
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
+  <% } %>
+<% } %>
 
-<% for (const distribution of COMPASS_DISTRIBUTIONS) { %>
-  - name: package-<%= distribution %>
-    tags: ['required-for-publish', 'run-on-pr', 'package-task']
+<% for(const group of E2E_TEST_GROUPS) { %>
+  - name: test-packaged-app-<%= group.number %>
+    tags:
+    - required-for-publish
+    - run-on-pr
     commands:
       - func: prepare
       - func: install
       - func: bootstrap
         vars:
-          scope: '@mongodb-js/webpack-config-compass'
+          scope: 'compass-e2e-tests'
       - func: apply-compass-target-expansion
         vars:
-          compass_distribution: <%= distribution %>
-      - func: spawn-signing-server
-      - func: package
+          compass_distribution: compass
+      - func: get-packaged-app
         vars:
-          debug: 'hadron*,mongo*,compass*,electron*,sign*'
-          compass_distribution: <%= distribution %>
-      - func: verify-artifacts
-      - func: save-all-artifacts
+          compass_distribution: compass
+      - func: test-packaged-app
         vars:
-          compass_distribution: <%= distribution %>
+          mongodb_version: latest
+          compass_distribution: compass
+          e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
+          e2e_test_group: <%= group.number %>
+          debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
 <% } %>
 
-<%
-for (const serverVersion of SERVER_VERSIONS) { %>
-  - name: test-packaged-app-<%= serverVersion.name %>
-    tags:
-    - required-for-publish
-    - run-on-pr
+<% for (const browser of BROWSERS) { %>
+  <% for(const group of E2E_TEST_GROUPS) { %>
+  - name: test-web-sandbox-<%= browser %>-<%= group.number %>
+    tags: ['required-for-publish', 'run-on-pr']
     commands:
       - func: prepare
       - func: install
@@ -424,14 +470,15 @@ for (const serverVersion of SERVER_VERSIONS) { %>
       - func: apply-compass-target-expansion
         vars:
           compass_distribution: compass
-      - func: get-packaged-app
-        vars:
-          compass_distribution: compass
-      - func: test-packaged-app
+      - func: test-web-sandbox
         vars:
-          mongodb_version: '<%= serverVersion.version %>'
+          mongodb_version: latest
+          browser_name: '<%= browser %>'
           compass_distribution: compass
+          e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
+          e2e_test_group: <%= group.number %>
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
+  <% } %>
 <% } %>
 
   - name: create_static_analysis_report