Merge branch 'main' into 1.31-releases

Author: lerouxb

.evergreen/buildvariants.in.yml

@@ -24,41 +24,36 @@ buildvariants:
 
   - name: coverage
     display_name: E2E Coverage
-    run_on: ubuntu2004-large
+    run_on: ubuntu1604-large
     tasks:
       - name: e2e-coverage
 
   - name: ubuntu_publish
     display_name: Publish Artifacts
-    run_on: ubuntu2004-large
+    run_on: ubuntu1604-large
     tasks:
       - name: publish
 
   - name: ubuntu_connectivity_tests
     display_name: Connectivity Tests
-    run_on: ubuntu2004-large
+    run_on: ubuntu1604-large
     tasks:
       - name: test-connectivity
 
   - name: ubuntu_csfle_tests
     display_name: CSFLE Tests
     run_on: ubuntu2004-large
     tasks:
-      - name: test-csfle<% for (const packageVariant of packageVariants) { %>
+      - name: test-csfle<% for (const buildVariant of buildVariants) { %>
 
-  - name: <% out(packageVariant.name) %>
-    display_name: <% out(packageVariant.display_name) %>
-    run_on: <% out(packageVariant.run_on) %>
+  - name: <% out(buildVariant.name) %>
+    display_name: <% out(buildVariant.display_name) %>
+    run_on: <% out(buildVariant.run_on) %>
     tasks:
       - name: test
       - name: test-electron
       - name: check
       - name: package
       - name: package-readonly
-      - name: package-isolated<% } for (const e2eVariant of e2eVariants) { %>
-
-  - name: <% out(e2eVariant.name) %>
-    display_name: <% out(e2eVariant.display_name) %>
-    run_on: <% out(e2eVariant.run_on) %>
-    tasks:<% for (const task of e2eVariant.tasks) { %>
-      - name: <% out(`${task.name}`) %><% }} %>
+      - name: package-isolated<% for (const task of buildVariant.tasks) { %>
+      - name: <% out(task.name) %><% }} %>

.evergreen/buildvariants.yml

@@ -24,19 +24,19 @@ buildvariants:
 
   - name: coverage
     display_name: E2E Coverage
-    run_on: ubuntu2004-large
+    run_on: ubuntu1604-large
     tasks:
       - name: e2e-coverage
 
   - name: ubuntu_publish
     display_name: Publish Artifacts
-    run_on: ubuntu2004-large
+    run_on: ubuntu1604-large
     tasks:
       - name: publish
 
   - name: ubuntu_connectivity_tests
     display_name: Connectivity Tests
-    run_on: ubuntu2004-large
+    run_on: ubuntu1604-large
     tasks:
       - name: test-connectivity
 
@@ -46,8 +46,8 @@ buildvariants:
     tasks:
       - name: test-csfle
 
-  - name: windows_package
-    display_name: windows (Test and Package)
+  - name: windows
+    display_name: Windows (Test and Package)
     run_on: windows-vsCurrent-large
     tasks:
       - name: test
@@ -56,9 +56,17 @@ buildvariants:
       - name: package
       - name: package-readonly
       - name: package-isolated
+      - name: test-packaged-app-40x-community
+      - name: test-packaged-app-40x-enterprise
+      - name: test-packaged-app-42x-community
+      - name: test-packaged-app-42x-enterprise
+      - name: test-packaged-app-44x-community
+      - name: test-packaged-app-44x-enterprise
+      - name: test-packaged-app-5x-community
+      - name: test-packaged-app-5x-enterprise
 
-  - name: ubuntu_package
-    display_name: ubuntu (Test and Package)
+  - name: ubuntu
+    display_name: Ubuntu (Test and Package)
     run_on: ubuntu1604-large
     tasks:
       - name: test
@@ -67,9 +75,15 @@ buildvariants:
       - name: package
       - name: package-readonly
       - name: package-isolated
+      - name: test-packaged-app-40x-community
+      - name: test-packaged-app-40x-enterprise
+      - name: test-packaged-app-42x-community
+      - name: test-packaged-app-42x-enterprise
+      - name: test-packaged-app-44x-community
+      - name: test-packaged-app-44x-enterprise
 
-  - name: rhel_package
-    display_name: rhel (Test and Package)
+  - name: rhel
+    display_name: RHEL (Test and Package)
     run_on: rhel76-large
     tasks:
       - name: test
@@ -78,40 +92,11 @@ buildvariants:
       - name: package
       - name: package-readonly
       - name: package-isolated
-
-  - name: windows_e2e
-    display_name: windows (E2E)
-    run_on: windows-vsCurrent-large
-    tasks:
-      - name: windows_e2e_test-packaged-app-40x-community
-      - name: windows_e2e_test-packaged-app-40x-enterprise
-      - name: windows_e2e_test-packaged-app-42x-community
-      - name: windows_e2e_test-packaged-app-42x-enterprise
-      - name: windows_e2e_test-packaged-app-44x-community
-      - name: windows_e2e_test-packaged-app-44x-enterprise
-      - name: windows_e2e_test-packaged-app-5x-community
-      - name: windows_e2e_test-packaged-app-5x-enterprise
-
-  - name: ubuntu_e2e
-    display_name: ubuntu (E2E)
-    run_on: ubuntu2004-large
-    tasks:
-      - name: ubuntu_e2e_test-packaged-app-40x-community
-      - name: ubuntu_e2e_test-packaged-app-42x-community
-      - name: ubuntu_e2e_test-packaged-app-44x-community
-      - name: ubuntu_e2e_test-packaged-app-44x-enterprise
-      - name: ubuntu_e2e_test-packaged-app-5x-community
-      - name: ubuntu_e2e_test-packaged-app-5x-enterprise
-
-  - name: rhel_e2e
-    display_name: rhel (E2E)
-    run_on: rhel76-large
-    tasks:
-      - name: rhel_e2e_test-packaged-app-40x-community
-      - name: rhel_e2e_test-packaged-app-40x-enterprise
-      - name: rhel_e2e_test-packaged-app-42x-community
-      - name: rhel_e2e_test-packaged-app-42x-enterprise
-      - name: rhel_e2e_test-packaged-app-44x-community
-      - name: rhel_e2e_test-packaged-app-44x-enterprise
-      - name: rhel_e2e_test-packaged-app-5x-community
-      - name: rhel_e2e_test-packaged-app-5x-enterprise
+      - name: test-packaged-app-40x-community
+      - name: test-packaged-app-40x-enterprise
+      - name: test-packaged-app-42x-community
+      - name: test-packaged-app-42x-enterprise
+      - name: test-packaged-app-44x-community
+      - name: test-packaged-app-44x-enterprise
+      - name: test-packaged-app-5x-community
+      - name: test-packaged-app-5x-enterprise

.evergreen/tasks.in.yml

@@ -45,19 +45,19 @@ tasks:
       - func: save-windows-artifacts
         vars:
           compass_distribution: compass
-        variants: [windows_package]
+        variants: [windows]
       - func: save-macos-artifacts
         vars:
           compass_distribution: compass
         variants: [macos]
       - func: save-rhel-artifacts
         vars:
           compass_distribution: compass
-        variants: [rhel_package]
+        variants: [rhel]
       - func: save-ubuntu-artifacts
         vars:
           compass_distribution: compass
-        variants: [ubuntu_package]
+        variants: [ubuntu]
 
   - name: package-isolated
     tags: ['required-for-publish', 'run-on-pr']
@@ -77,19 +77,19 @@ tasks:
       - func: save-windows-artifacts
         vars:
           compass_distribution: compass-isolated
-        variants: [windows_package]
+        variants: [windows]
       - func: save-macos-artifacts
         vars:
           compass_distribution: compass-isolated
         variants: [macos]
       - func: save-rhel-artifacts
         vars:
           compass_distribution: compass-isolated
-        variants: [rhel_package]
+        variants: [rhel]
       - func: save-ubuntu-artifacts
         vars:
           compass_distribution: compass-isolated
-        variants: [ubuntu_package]
+        variants: [ubuntu]
 
   - name: package-readonly
     tags: ['required-for-publish', 'run-on-pr']
@@ -109,19 +109,19 @@ tasks:
       - func: save-windows-artifacts
         vars:
           compass_distribution: compass-readonly
-        variants: [windows_package]
+        variants: [windows]
       - func: save-macos-artifacts
         vars:
           compass_distribution: compass-readonly
         variants: [macos]
       - func: save-rhel-artifacts
         vars:
           compass_distribution: compass-readonly
-        variants: [rhel_package]
+        variants: [rhel]
       - func: save-ubuntu-artifacts
         vars:
           compass_distribution: compass-readonly
-        variants: [ubuntu_package]
+        variants: [ubuntu]
 
   - name: test-connectivity
     tags: ['required-for-publish']
@@ -277,13 +277,12 @@ tasks:
           target_platform: '--platform=darwin'
 
   # copied as test-packaged-app-macos due to depends_on variation
-  <% for (const task of allTestPackagedAppTasks) { %>
+  <% for (const task of testPackagedAppVariations) { %>
 
   - name: <% out(task.name) %>
     tags: ['required-for-publish', 'run-on-pr']
     depends_on:
-      name: package
-      variant: <% out(task.dependVariantName) %>
+      - name: package
     commands:
       - func: prepare
       - func: install