fix: localdev windows tests not running

mongodb · Sep 11, 2024 · 532aaa0 · 532aaa0
1 parent bfe9674
commit 532aaa0
Showing 1 changed file with 32 additions and 95 deletions.
diff --git a/build/ci/evergreen.yml b/build/ci/evergreen.yml
@@ -1603,6 +1603,34 @@ task_groups:
       - func: "terraform destroy"
     tasks:
       - .e2e .deployments .windows
+axes:
+- id: os
+  display_name: "OS"
+  values:
+  - id: debian11
+    display_name: "Debian 11"
+    run_on: debian11-small
+  - id: debian12
+    display_name: "Debian 12"
+    run_on: debian12-small
+  - id: al2023
+    display_name: "Amazon Linux 2023"
+    run_on: amazon2023-latest-small
+  - id: ubuntu22
+    display_name: "Ubuntu 22.04"
+    run_on: ubuntu2204-small
+  - id: rhel80
+    display_name: "RHEL 8.0"
+    run_on: rhel80-small
+  - id: rhel90
+    display_name: "RHEL 9.0"
+    run_on: rhel90-small
+  - id: macos14
+    display_name: "macOS 14"
+    run_on: macos-14-arm64-docker
+  - id: macos13
+    display_name: "macOS 13"
+    run_on: macos-13-arm64-docker
 buildvariants:
   - name: code_health
     display_name: "Code Health"
@@ -1717,18 +1745,6 @@ buildvariants:
       <<: *go_linux_version
     tasks:
       - name: ".e2e .deployments .atlas"
-  - name: e2e_local_deployments_ubuntu22
-    display_name: "E2E Local Deployments Tests (ubuntu 22.04/docker)"
-    run_on:
-      - ubuntu2204-small
-    expansions:
-      <<: *go_linux_version
-    tasks:
-      - name: ".e2e .deployments .local"
-        depends_on:
-        - name: compile
-          variant: "code_health"
-          patch_optional: true
   - name: e2e_local_deployments_ubuntu24
     display_name: "E2E Local Deployments Tests (ubuntu 24.04/docker)"
     run_on:
@@ -1742,58 +1758,13 @@ buildvariants:
         - name: compile
           variant: "code_health"
           patch_optional: true
-  - name: e2e_local_deployments_debian11
-    display_name: "E2E Local Deployments Tests (debian 11/docker)"
-    run_on:
-      - debian11-small
-    tags:
-      - localdev
-    allowed_requesters: ["patch", "ad_hoc", "github_pr"]
-    expansions:
-      <<: *go_linux_version
-    tasks:
-      - name: ".e2e .deployments .local"
-        depends_on:
-        - name: compile
-          variant: "code_health"
-          patch_optional: true
-  - name: e2e_local_deployments_debian12
-    display_name: "E2E Local Deployments Tests (debian 12/docker)"
-    run_on:
-      - debian12-small
-    tags:
-      - localdev
-    allowed_requesters: ["patch", "ad_hoc", "github_pr"]
-    expansions:
-      <<: *go_linux_version
-    tasks:
-      - name: ".e2e .deployments .local"
-        depends_on:
-        - name: compile
-          variant: "code_health"
-          patch_optional: true
-  - name: e2e_local_deployments_al2023 
-    display_name: "E2E Local Deployments Tests (amazon linux 2023/docker)"
-    run_on:
-      - amazon2023-latest-small
-    tags:
-      - localdev
-    allowed_requesters: ["patch", "ad_hoc", "github_pr"]
-    expansions:
-      <<: *go_linux_version
-    tasks:
-      - name: ".e2e .deployments .local"
-        depends_on:
-        - name: compile
-          variant: "code_health"
-          patch_optional: true
   - name: e2e_local_deployments_windows
     display_name: "E2E Local Deployments Tests (windows/docker)"
     allowed_requesters: ["patch", "ad_hoc", "github_pr"]
     tags:
       - localdev
     run_on:
-      - rhel94-small
+      - rhel90-small
     expansions:
       <<: *go_linux_version
     tasks:
@@ -1818,46 +1789,12 @@ buildvariants:
       <<: *go_linux_version
     tasks:
       - name: ".e2e .atlas .plugin"
-  - name: e2e_local_deployments_rhel9
-    display_name: "E2E Local Deployments Tests (rhel9/podman)"
-    allowed_requesters: ["patch", "ad_hoc", "github_pr"]
-    tags:
-      - localdev
-    run_on:
-      - rhel90-small
-    expansions:
-      <<: *go_linux_version
-    tasks:
-      - name: ".e2e .deployments .local"
-  - name: e2e_local_deployments_rhel8
-    display_name: "E2E Local Deployments Tests (rhel8/podman)"
+  - matrix_name: "e2e_local_deployments"
+    matrix_spec: {os: "*"}
+    display_name: "E2E Local Deployments Tests (${os})"
     allowed_requesters: ["patch", "ad_hoc", "github_pr"]
     tags:
       - localdev
-    run_on:
-      - rhel80-small
-    expansions:
-      <<: *go_linux_version
-    tasks:
-      - name: ".e2e .deployments .local"
-  - name: e2e_local_deployments_macos_14
-    display_name: "E2E Local Deployments Tests (macos 14/docker)"
-    allowed_requesters: ["patch", "ad_hoc", "github_pr"]
-    tags:
-      - localdev
-    run_on:
-      - macos-14-arm64-docker
-    expansions:
-      <<: *go_linux_version
-    tasks:
-      - name: ".e2e .deployments .local"
-  - name: e2e_local_deployments_macos_13
-    display_name: "E2E Local Deployments Tests (macos 13/docker)"
-    allowed_requesters: ["patch", "ad_hoc", "github_pr"]
-    tags:
-      - localdev
-    run_on:
-      - macos-13-arm64-docker
     expansions:
       <<: *go_linux_version
     tasks: