Convert Enterprise Auth Variants to use common tasks (#2330)

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -136,50 +136,6 @@ tasks:
     depends_on: [{ name: .server-version, variant: .coverage_tag, status: "*", patch_optional: true }]
     tags: [coverage]
 
-  # Enterprise auth tests
-  - name: test-enterprise-auth-python3.9
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: enterprise_auth
-          AUTH: auth
-          PYTHON_VERSION: "3.9"
-      - func: assume ec2 role
-      - func: run tests
-        vars:
-          TEST_NAME: enterprise_auth
-          AUTH: auth
-          PYTHON_VERSION: "3.9"
-    tags: [enterprise_auth]
-  - name: test-enterprise-auth-python3.13
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: enterprise_auth
-          AUTH: auth
-          PYTHON_VERSION: "3.13"
-      - func: assume ec2 role
-      - func: run tests
-        vars:
-          TEST_NAME: enterprise_auth
-          AUTH: auth
-          PYTHON_VERSION: "3.13"
-    tags: [enterprise_auth]
-  - name: test-enterprise-auth-pypy3.10
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: enterprise_auth
-          AUTH: auth
-          PYTHON_VERSION: pypy3.10
-      - func: assume ec2 role
-      - func: run tests
-        vars:
-          TEST_NAME: enterprise_auth
-          AUTH: auth
-          PYTHON_VERSION: pypy3.10
-    tags: [enterprise_auth, pypy]
-
   # Free threading tests
   - name: test-free-threading
     commands:
@@ -3928,6 +3884,7 @@ tasks:
       - server-4.0
       - python-3.9
       - standalone-noauth-nossl
+      - noauth
   - name: test-non-standard-v4.0-python3.10-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -3948,6 +3905,7 @@ tasks:
       - server-4.0
       - python-3.10
       - replica_set-noauth-ssl
+      - noauth
   - name: test-non-standard-v4.0-python3.11-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -3968,6 +3926,7 @@ tasks:
       - server-4.0
       - python-3.11
       - sharded_cluster-auth-ssl
+      - auth
   - name: test-non-standard-v4.2-python3.12-noauth-nossl-standalone
     commands:
       - func: run server
@@ -3988,6 +3947,7 @@ tasks:
       - server-4.2
       - python-3.12
       - standalone-noauth-nossl
+      - noauth
   - name: test-non-standard-v4.2-python3.13-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -4008,6 +3968,7 @@ tasks:
       - server-4.2
       - python-3.13
       - replica_set-noauth-ssl
+      - noauth
   - name: test-non-standard-v4.2-python3.9-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -4028,6 +3989,7 @@ tasks:
       - server-4.2
       - python-3.9
       - sharded_cluster-auth-ssl
+      - auth
   - name: test-non-standard-v4.4-python3.10-noauth-nossl-standalone
     commands:
       - func: run server
@@ -4048,6 +4010,7 @@ tasks:
       - server-4.4
       - python-3.10
       - standalone-noauth-nossl
+      - noauth
   - name: test-non-standard-v4.4-python3.11-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -4068,6 +4031,7 @@ tasks:
       - server-4.4
       - python-3.11
       - replica_set-noauth-ssl
+      - noauth
   - name: test-non-standard-v4.4-python3.12-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -4088,6 +4052,7 @@ tasks:
       - server-4.4
       - python-3.12
       - sharded_cluster-auth-ssl
+      - auth
   - name: test-non-standard-v5.0-python3.13-noauth-nossl-standalone
     commands:
       - func: run server
@@ -4108,6 +4073,7 @@ tasks:
       - server-5.0
       - python-3.13
       - standalone-noauth-nossl
+      - noauth
   - name: test-non-standard-v5.0-python3.9-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -4128,6 +4094,7 @@ tasks:
       - server-5.0
       - python-3.9
       - replica_set-noauth-ssl
+      - noauth
   - name: test-non-standard-v5.0-python3.10-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -4148,6 +4115,7 @@ tasks:
       - server-5.0
       - python-3.10
       - sharded_cluster-auth-ssl
+      - auth
   - name: test-non-standard-v6.0-python3.11-noauth-nossl-standalone
     commands:
       - func: run server
@@ -4168,6 +4136,7 @@ tasks:
       - server-6.0
       - python-3.11
       - standalone-noauth-nossl
+      - noauth
   - name: test-non-standard-v6.0-python3.12-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -4188,6 +4157,7 @@ tasks:
       - server-6.0
       - python-3.12
       - replica_set-noauth-ssl
+      - noauth
   - name: test-non-standard-v6.0-python3.13-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -4208,6 +4178,7 @@ tasks:
       - server-6.0
       - python-3.13
       - sharded_cluster-auth-ssl
+      - auth
   - name: test-non-standard-v7.0-python3.9-noauth-nossl-standalone
     commands:
       - func: run server
@@ -4228,6 +4199,7 @@ tasks:
       - server-7.0
       - python-3.9
       - standalone-noauth-nossl
+      - noauth
   - name: test-non-standard-v7.0-python3.10-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -4248,6 +4220,7 @@ tasks:
       - server-7.0
       - python-3.10
       - replica_set-noauth-ssl
+      - noauth
   - name: test-non-standard-v7.0-python3.11-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -4268,6 +4241,7 @@ tasks:
       - server-7.0
       - python-3.11
       - sharded_cluster-auth-ssl
+      - auth
   - name: test-non-standard-v8.0-python3.12-noauth-nossl-standalone
     commands:
       - func: run server
@@ -4288,6 +4262,7 @@ tasks:
       - server-8.0
       - python-3.12
       - standalone-noauth-nossl
+      - noauth
   - name: test-non-standard-v8.0-python3.13-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -4308,6 +4283,7 @@ tasks:
       - server-8.0
       - python-3.13
       - replica_set-noauth-ssl
+      - noauth
   - name: test-non-standard-v8.0-python3.9-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -4328,6 +4304,7 @@ tasks:
       - server-8.0
       - python-3.9
       - sharded_cluster-auth-ssl
+      - auth
   - name: test-non-standard-rapid-python3.10-noauth-nossl-standalone
     commands:
       - func: run server
@@ -4348,6 +4325,7 @@ tasks:
       - server-rapid
       - python-3.10
       - standalone-noauth-nossl
+      - noauth
   - name: test-non-standard-rapid-python3.11-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -4368,6 +4346,7 @@ tasks:
       - server-rapid
       - python-3.11
       - replica_set-noauth-ssl
+      - noauth
   - name: test-non-standard-rapid-python3.12-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -4388,6 +4367,7 @@ tasks:
       - server-rapid
       - python-3.12
       - sharded_cluster-auth-ssl
+      - auth
   - name: test-non-standard-latest-python3.13-noauth-nossl-standalone
     commands:
       - func: run server
@@ -4408,6 +4388,7 @@ tasks:
       - server-latest
       - python-3.13
       - standalone-noauth-nossl
+      - noauth
   - name: test-non-standard-latest-python3.9-noauth-ssl-replica-set
     commands:
       - func: run server
@@ -4428,6 +4409,7 @@ tasks:
       - server-latest
       - python-3.9
       - replica_set-noauth-ssl
+      - noauth
   - name: test-non-standard-latest-python3.10-auth-ssl-sharded-cluster
     commands:
       - func: run server
@@ -4448,6 +4430,7 @@ tasks:
       - server-latest
       - python-3.10
       - sharded_cluster-auth-ssl
+      - auth
   - name: test-non-standard-v4.0-pypy3.10-noauth-nossl-standalone
     commands:
       - func: run server
@@ -4468,6 +4451,7 @@ tasks:
       - server-4.0
       - python-pypy3.10
       - standalone-noauth-nossl
+      - noauth
       - pypy
   - name: test-non-standard-v4.2-pypy3.10-noauth-ssl-replica-set
     commands:
@@ -4489,6 +4473,7 @@ tasks:
       - server-4.2
       - python-pypy3.10
       - replica_set-noauth-ssl
+      - noauth
       - pypy
   - name: test-non-standard-v4.4-pypy3.10-auth-ssl-sharded-cluster
     commands:
@@ -4510,6 +4495,7 @@ tasks:
       - server-4.4
       - python-pypy3.10
       - sharded_cluster-auth-ssl
+      - auth
       - pypy
   - name: test-non-standard-v5.0-pypy3.10-noauth-nossl-standalone
     commands:
@@ -4531,6 +4517,7 @@ tasks:
       - server-5.0
       - python-pypy3.10
       - standalone-noauth-nossl
+      - noauth
       - pypy
   - name: test-non-standard-v6.0-pypy3.10-noauth-ssl-replica-set
     commands:
@@ -4552,6 +4539,7 @@ tasks:
       - server-6.0
       - python-pypy3.10
       - replica_set-noauth-ssl
+      - noauth
       - pypy
   - name: test-non-standard-v7.0-pypy3.10-auth-ssl-sharded-cluster
     commands:
@@ -4573,6 +4561,7 @@ tasks:
       - server-7.0
       - python-pypy3.10
       - sharded_cluster-auth-ssl
+      - auth
       - pypy
   - name: test-non-standard-v8.0-pypy3.10-noauth-nossl-standalone
     commands:
@@ -4594,6 +4583,7 @@ tasks:
       - server-8.0
       - python-pypy3.10
       - standalone-noauth-nossl
+      - noauth
       - pypy
   - name: test-non-standard-rapid-pypy3.10-noauth-ssl-replica-set
     commands:
@@ -4615,6 +4605,7 @@ tasks:
       - server-rapid
       - python-pypy3.10
       - replica_set-noauth-ssl
+      - noauth
       - pypy
   - name: test-non-standard-latest-pypy3.10-auth-ssl-sharded-cluster
     commands:
@@ -4636,4 +4627,5 @@ tasks:
       - server-latest
       - python-pypy3.10
       - sharded_cluster-auth-ssl
+      - auth
       - pypy

.evergreen/generated_configs/variants.yml

@@ -251,24 +251,33 @@ buildvariants:
     tags: [encryption_tag]
 
   # Enterprise auth tests
+  - name: auth-enterprise-rhel8
+    tasks:
+      - name: .test-non-standard .auth
+    display_name: Auth Enterprise RHEL8
+    run_on:
+      - rhel87-small
+    expansions:
+      TEST_NAME: enterprise_auth
+      AUTH: auth
   - name: auth-enterprise-macos
     tasks:
-      - name: .enterprise_auth !.pypy
+      - name: .test-non-standard !.pypy .auth
     display_name: Auth Enterprise macOS
     run_on:
       - macos-14
+    expansions:
+      TEST_NAME: enterprise_auth
+      AUTH: auth
   - name: auth-enterprise-win64
     tasks:
-      - name: .enterprise_auth !.pypy
+      - name: .test-non-standard !.pypy .auth
     display_name: Auth Enterprise Win64
     run_on:
       - windows-64-vsMulti-small
-  - name: auth-enterprise-rhel8
-    tasks:
-      - name: .enterprise_auth
-    display_name: Auth Enterprise RHEL8
-    run_on:
-      - rhel87-small
+    expansions:
+      TEST_NAME: enterprise_auth
+      AUTH: auth
 
   # Free threaded tests
   - name: free-threaded-rhel8-python3.13t
@@ -368,7 +377,7 @@ buildvariants:
   - name: mod_wsgi-ubuntu-22
     tasks:
       - name: .mod_wsgi
-    display_name: mod_wsgi Ubuntu-22
+    display_name: Mod_WSGI Ubuntu-22
     run_on:
       - ubuntu2204-small
     expansions: