renable the usual variants

Author: lerouxb

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

@@ -67,28 +67,28 @@ const SMOKETEST_BUILD_VARIANTS = [
 //    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-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-gui',
-//    depends_on: 'package-macos-x64',
-//  },
+  {
+    name: 'smoketest-macos-x64',
+    display_name: 'Smoketest MacOS Intel',
+    run_on: 'macos-14-gui',
+    depends_on: 'package-macos-x64',
+  },
   {
     name: 'smoketest-macos-arm',
     display_name: 'Smoketest MacOS Arm64',
-    run_on: 'macos-14-arm64-gui-dev',
+    run_on: 'macos-14-arm64-gui',
     depends_on: 'package-macos-arm',
   }
 ];

.evergreen/buildvariants-and-tasks.yml

@@ -76,9 +76,25 @@ buildvariants:
       - name: package-compass
       - name: package-compass-isolated
       - name: package-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-macos-x64-compass
+    display_name: Smoketest MacOS Intel (compass)
+    run_on: macos-14-gui
+    depends_on:
+      - name: package-compass
+        variant: package-macos-x64
+    tasks:
+      - name: smoketest-compass
   - name: smoketest-macos-arm-compass
     display_name: Smoketest MacOS Arm64 (compass)
-    run_on: macos-14-arm64-gui-dev
+    run_on: macos-14-arm64-gui
     depends_on:
       - name: package-compass
         variant: package-macos-arm