limit to just ubuntu and just the compass distribution for now

Author: lerouxb

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

@@ -64,33 +64,34 @@ const SMOKETEST_BUILD_VARIANTS = [
   {
     name: 'smoketest-ubuntu',
     display_name: 'Smoketest Ubuntu',
-    run_on: 'ubuntu1804-large',
+    run_on: 'ubuntu2004-large',
     depends_on: 'package-ubuntu',
   },
-  {
-    name: 'smoketest-windows',
-    display_name: 'Smoketest Windows',
-    run_on: 'windows-vsCurrent-large',
-    depends_on: 'package-windows',
-  },
-  {
-    name: 'smoketest-rhel',
-    display_name: 'Smoketest RHEL',
-    run_on: 'rhel80-large',
-    depends_on: 'package-rhel',
-  },
-  {
-    name: 'smoketest-macos-x64',
-    display_name: 'Smoketest MacOS Intel',
-    run_on: 'macos-14',
-    depends_on: 'package-macos-x64',
-  },
-  {
-    name: 'smoketest-macos-arm',
-    display_name: 'Smoketest MacOS Arm64',
-    run_on: 'macos-14-arm64',
-    depends_on: 'package-macos-arm',
-  }
+  
+//  {
+//    name: 'smoketest-windows',
+//    display_name: 'Smoketest Windows',
+//    run_on: 'windows-vsCurrent-large',
+//    depends_on: 'package-windows',
+//  },
+//  {
+//    name: 'smoketest-rhel',
+//    display_name: 'Smoketest RHEL',
+//    run_on: 'rhel80-large',
+//    depends_on: 'package-rhel',
+//  },
+//  {
+//    name: 'smoketest-macos-x64',
+//    display_name: 'Smoketest MacOS Intel',
+//    run_on: 'macos-14',
+//    depends_on: 'package-macos-x64',
+//  },
+//  {
+//    name: 'smoketest-macos-arm',
+//    display_name: 'Smoketest MacOS Arm64',
+//    run_on: 'macos-14-arm64',
+//    depends_on: 'package-macos-arm',
+//  }
 ];
 
 const TEST_PACKAGED_APP_BUILD_VARIANTS = [
@@ -214,7 +215,7 @@ buildvariants:
 <% } %>
 
 <% for (const buildVariant of SMOKETEST_BUILD_VARIANTS) { %>
-<% for (const distribution of COMPASS_DISTRIBUTIONS) { %>
+<% for (const distribution of ['compass']) { %>
   - name: <%= buildVariant.name %>-<%= distribution %>
     display_name: <%= buildVariant.display_name %> (<%= distribution %>)
     run_on: <%= buildVariant.run_on %>
@@ -470,7 +471,9 @@ tasks:
       - func: save-all-artifacts
         vars:
           compass_distribution: <%= distribution %>
+  <% } %>
 
+<% for (const distribution of ['compass']) { %>
   - name: smoketest-<%= distribution %>
     tags: ['required-for-publish', 'run-on-pr']
     commands:

.evergreen/buildvariants-and-tasks.yml

@@ -78,124 +78,12 @@ buildvariants:
       - name: package-compass-readonly
   - name: smoketest-ubuntu-compass
     display_name: Smoketest Ubuntu (compass)
-    run_on: ubuntu1804-large
+    run_on: ubuntu2004-large
     depends_on:
       - name: package-compass
         variant: package-ubuntu
     tasks:
       - name: smoketest-compass
-  - name: smoketest-ubuntu-compass-isolated
-    display_name: Smoketest Ubuntu (compass-isolated)
-    run_on: ubuntu1804-large
-    depends_on:
-      - name: package-compass-isolated
-        variant: package-ubuntu
-    tasks:
-      - name: smoketest-compass-isolated
-  - name: smoketest-ubuntu-compass-readonly
-    display_name: Smoketest Ubuntu (compass-readonly)
-    run_on: ubuntu1804-large
-    depends_on:
-      - name: package-compass-readonly
-        variant: package-ubuntu
-    tasks:
-      - name: smoketest-compass-readonly
-  - name: smoketest-windows-compass
-    display_name: Smoketest Windows (compass)
-    run_on: windows-vsCurrent-large
-    depends_on:
-      - name: package-compass
-        variant: package-windows
-    tasks:
-      - name: smoketest-compass
-  - name: smoketest-windows-compass-isolated
-    display_name: Smoketest Windows (compass-isolated)
-    run_on: windows-vsCurrent-large
-    depends_on:
-      - name: package-compass-isolated
-        variant: package-windows
-    tasks:
-      - name: smoketest-compass-isolated
-  - name: smoketest-windows-compass-readonly
-    display_name: Smoketest Windows (compass-readonly)
-    run_on: windows-vsCurrent-large
-    depends_on:
-      - name: package-compass-readonly
-        variant: package-windows
-    tasks:
-      - name: smoketest-compass-readonly
-  - name: smoketest-rhel-compass
-    display_name: Smoketest RHEL (compass)
-    run_on: rhel80-large
-    depends_on:
-      - name: package-compass
-        variant: package-rhel
-    tasks:
-      - name: smoketest-compass
-  - name: smoketest-rhel-compass-isolated
-    display_name: Smoketest RHEL (compass-isolated)
-    run_on: rhel80-large
-    depends_on:
-      - name: package-compass-isolated
-        variant: package-rhel
-    tasks:
-      - name: smoketest-compass-isolated
-  - name: smoketest-rhel-compass-readonly
-    display_name: Smoketest RHEL (compass-readonly)
-    run_on: rhel80-large
-    depends_on:
-      - name: package-compass-readonly
-        variant: package-rhel
-    tasks:
-      - name: smoketest-compass-readonly
-  - name: smoketest-macos-x64-compass
-    display_name: Smoketest MacOS Intel (compass)
-    run_on: macos-14
-    depends_on:
-      - name: package-compass
-        variant: package-macos-x64
-    tasks:
-      - name: smoketest-compass
-  - name: smoketest-macos-x64-compass-isolated
-    display_name: Smoketest MacOS Intel (compass-isolated)
-    run_on: macos-14
-    depends_on:
-      - name: package-compass-isolated
-        variant: package-macos-x64
-    tasks:
-      - name: smoketest-compass-isolated
-  - name: smoketest-macos-x64-compass-readonly
-    display_name: Smoketest MacOS Intel (compass-readonly)
-    run_on: macos-14
-    depends_on:
-      - name: package-compass-readonly
-        variant: package-macos-x64
-    tasks:
-      - name: smoketest-compass-readonly
-  - name: smoketest-macos-arm-compass
-    display_name: Smoketest MacOS Arm64 (compass)
-    run_on: macos-14-arm64
-    depends_on:
-      - name: package-compass
-        variant: package-macos-arm
-    tasks:
-      - name: smoketest-compass
-  - name: smoketest-macos-arm-compass-isolated
-    display_name: Smoketest MacOS Arm64 (compass-isolated)
-    run_on: macos-14-arm64
-    depends_on:
-      - name: package-compass-isolated
-        variant: package-macos-arm
-    tasks:
-      - name: smoketest-compass-isolated
-  - name: smoketest-macos-arm-compass-readonly
-    display_name: Smoketest MacOS Arm64 (compass-readonly)
-    run_on: macos-14-arm64
-    depends_on:
-      - name: package-compass-readonly
-        variant: package-macos-arm
-    tasks:
-      - name: smoketest-compass-readonly
   - name: test-eol-servers
     display_name: Test EoL Servers
     run_on: ubuntu1804-large
@@ -546,21 +434,6 @@ tasks:
       - func: save-all-artifacts
         vars:
           compass_distribution: compass
-  - name: smoketest-compass
-    tags:
-      - required-for-publish
-      - run-on-pr
-    commands:
-      - func: prepare
-      - func: install
-      - func: bootstrap
-        vars:
-          scope: '@mongodb-js/compass-e2e-tests'
-      - func: smoketest-packaged-app
-        vars:
-          mongodb_version: latest-enterprise
-          compass_distribution: compass
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: package-compass-isolated
     tags:
       - required-for-publish
@@ -584,21 +457,6 @@ tasks:
       - func: save-all-artifacts
         vars:
           compass_distribution: compass-isolated
-  - name: smoketest-compass-isolated
-    tags:
-      - required-for-publish
-      - run-on-pr
-    commands:
-      - func: prepare
-      - func: install
-      - func: bootstrap
-        vars:
-          scope: '@mongodb-js/compass-e2e-tests'
-      - func: smoketest-packaged-app
-        vars:
-          mongodb_version: latest-enterprise
-          compass_distribution: compass-isolated
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: package-compass-readonly
     tags:
       - required-for-publish
@@ -622,7 +480,7 @@ tasks:
       - func: save-all-artifacts
         vars:
           compass_distribution: compass-readonly
-  - name: smoketest-compass-readonly
+  - name: smoketest-compass
     tags:
       - required-for-publish
       - run-on-pr
@@ -635,7 +493,7 @@ tasks:
       - func: smoketest-packaged-app
         vars:
           mongodb_version: latest-enterprise
-          compass_distribution: compass-readonly
+          compass_distribution: compass
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: test-server-40x-community-1
     tags: