more evergreen config tweaks

Author: jamis

.evergreen/config.yml

@@ -467,65 +467,6 @@ post:
   - func: "upload test results to s3"
 
 task_groups:
-  - name: serverless_task_group
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800 # 30 minutes
-    setup_group:
-      - func: "fetch source"
-      - func: "create expansions"
-      - command: ec2.assume_role
-        params:
-          role_arn: ${aws_test_secrets_role}
-      - command: shell.exec
-        params:
-          shell: "bash"
-          script: |
-            ${PREPARE_SHELL}
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
-      - command: expansions.update
-        params:
-          file: serverless-expansion.yml
-    teardown_task:
-      - command: shell.exec
-        params:
-          script: |
-            ${PREPARE_SHELL}
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
-      - func: "upload test results"
-    tasks:
-      - "test-serverless"
-
-  - name: serverless_next_task_group
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800 # 30 minutes
-    setup_group:
-      - func: "fetch source"
-      - func: "create expansions"
-      - command: ec2.assume_role
-        params:
-          role_arn: ${aws_test_secrets_role}
-      - command: shell.exec
-        params:
-          shell: "bash"
-          script: |
-            ${PREPARE_SHELL}
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh serverless_next
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
-      - command: expansions.update
-        params:
-          file: serverless-expansion.yml
-    teardown_task:
-      - command: shell.exec
-        params:
-          script: |
-            ${PREPARE_SHELL}
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh serverless_next
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
-      - func: "upload test results"
-    tasks:
-      - "test-serverless"
-
   - name: testatlas_task_group
     setup_group_can_fail_task: true
     setup_group_timeout_secs: 1800 # 30 minutes
@@ -755,37 +696,19 @@ tasks:
   - name: "test-atlas"
     commands:
       - func: "run Atlas tests"
-  - name: "test-serverless"
-    commands:
-      - func: "export FLE credentials"
-      - func: "run serverless tests"
-  - name: "test-docker"
-    commands:
-      - func: "build and test docker image"
   - name: "test-mlaunch"
     commands:
       - func: "run tests"
   - name: "driver-bench"
     commands:
       - func: "run benchmarks"
-  - name: "test-via-docker"
-    commands:
-      - func: "run tests via docker"
-  - name: "test-kerberos-integration"
-    commands:
-      - func: "export Kerberos credentials"
-      - func: "run Kerberos integration tests"
   - name: "test-kerberos"
     commands:
       - func: "run Kerberos unit tests"
   - name: "test-fle"
     commands:
       - func: "export FLE credentials"
       - func: "run tests"
-  - name: "test-fle-via-docker"
-    commands:
-      - func: "export FLE credentials"
-      - func: "run tests via docker"
   - name: "test-aws-auth"
     commands:
       - func: "export AWS auth credentials"
@@ -1341,7 +1264,7 @@ buildvariants:
   - matrix_name: "mongo-5.x"
     matrix_spec:
       ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
-      mongodb-version: ['5.3', '5.0']
+      mongodb-version: '5.0'
       topology: ["standalone", "replica-set", "sharded-cluster"]
       os: ubuntu1804
     display_name: "${mongodb-version} ${topology} ${ruby}"
@@ -1462,7 +1385,7 @@ buildvariants:
       ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
       mongodb-version: "7.0"
       topology: ["standalone", "replica-set", "sharded-cluster"]
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "${mongodb-version} ${topology} solo ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1482,7 +1405,7 @@ buildvariants:
     matrix_spec:
       stress: on
       ruby: "ruby-3.2"
-      mongodb-version: ["6.0", "5.3"]
+      mongodb-version: ["6.0", "5.0"]
       topology: replica-set
       os: ubuntu2204
     display_name: "${mongodb-version} ${topology} stress ${ruby}"
@@ -1518,7 +1441,7 @@ buildvariants:
       mongodb-version: "7.0"
       topology: "replica-set"
       compressor: 'zlib'
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1530,7 +1453,7 @@ buildvariants:
       mongodb-version: "7.0"
       topology: "replica-set"
       compressor: 'snappy'
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1546,7 +1469,7 @@ buildvariants:
       mongodb-version: "7.0"
       topology: "replica-set"
       compressor: 'zstd'
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "${compressor} ${mongodb-version} ${topology} ${auth-and-ssl} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1557,7 +1480,7 @@ buildvariants:
       mongodb-version: "7.0"
       topology: replica-set
       as: as
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "AS ${mongodb-version} ${topology} ${ruby}"
     tasks:
       - name: "test-mlaunch"
@@ -1568,20 +1491,11 @@ buildvariants:
       mongodb-version: "7.0"
       topology: replica-set
       bson: "*"
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "bson-${bson} ${mongodb-version} ${topology} ${ruby}"
     tasks:
       - name: "test-mlaunch"
 
-  # kerberos integration tests are broken (RUBY-3266)
-  # - matrix_name: "kerberos-integration"
-  #   matrix_spec:
-  #     ruby: ["ruby-3.2", "ruby-2.7", "jruby-9.4"]
-  #     os: rhel8
-  #   display_name: "Kerberos integration ${os} ${ruby}"
-  #   tasks:
-  #     - name: "test-kerberos-integration"
-
   - matrix_name: "kerberos-unit"
     matrix_spec:
       ruby: "ruby-3.2"
@@ -1629,7 +1543,7 @@ buildvariants:
       # enough to install mongosh, and then use either mongo or mongosh
       # (depending on server version and what's available), we can bump this to
       # the latest stable db version.
-      mongodb-version: "5.3"
+      mongodb-version: "5.0"
       os: ubuntu2004
     display_name: "AWS ${auth-and-ssl} ${mongodb-version} ${ruby}"
     tasks:
@@ -1642,7 +1556,7 @@ buildvariants:
       ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "OCSP verifier: ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1655,7 +1569,7 @@ buildvariants:
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
-      os: ubuntu2204
+      os: ubuntu2004
       auth-and-ssl: noauth-and-ssl
     display_name: "OCSP integration - must staple: ${mongodb-version} ${ruby}"
     tasks:
@@ -1668,7 +1582,7 @@ buildvariants:
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
-      os: ubuntu2204
+      os: ubuntu2004
       auth-and-ssl: noauth-and-ssl
     display_name: "OCSP integration - unknown: ${mongodb-version} ${ruby}"
     tasks:
@@ -1684,7 +1598,7 @@ buildvariants:
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1698,7 +1612,7 @@ buildvariants:
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1712,7 +1626,7 @@ buildvariants:
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1726,7 +1640,7 @@ buildvariants:
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1740,7 +1654,7 @@ buildvariants:
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1754,7 +1668,7 @@ buildvariants:
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1768,7 +1682,7 @@ buildvariants:
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1782,7 +1696,7 @@ buildvariants:
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1796,7 +1710,7 @@ buildvariants:
       ruby: ["ruby-3.2", "ruby-2.7"]
       topology: standalone
       mongodb-version: "7.0"
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "OCSP connectivity: ${ocsp-algorithm} ${ocsp-status} ${ocsp-delegate} ${extra-uri-options} ${mongodb-version} ${ruby}"
     tasks:
       - name: test-mlaunch
@@ -1856,34 +1770,11 @@ buildvariants:
   - matrix_name: "atlas"
     matrix_spec:
       ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
-      os: ubuntu2204
+      os: ubuntu2004
     display_name: "Atlas tests ${ruby}"
     tasks:
        - name: testatlas_task_group
 
-# Commented out, pending RUBY-3414
-#  - matrix_name: "serverless"
-#    matrix_spec:
-#      # https://jira.mongodb.org/browse/RUBY-3217
-#      # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
-#      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7"]
-#      fle: path
-#      os: rhel8
-#    display_name: "Atlas serverless ${ruby}"
-#    tasks:
-#       - name: serverless_task_group
-#
-#  - matrix_name: "serverless-next"
-#    matrix_spec:
-#      # https://jira.mongodb.org/browse/RUBY-3217
-#      # ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7", "jruby-9.4", "jruby-9.3"]
-#      ruby: ["ruby-3.2", "ruby-3.1", "ruby-3.0", "ruby-2.7"]
-#      fle: path
-#      os: rhel8
-#    display_name: "Atlas serverless-next ${ruby}"
-#    tasks:
-#       - name: serverless_next_task_group
-
   - matrix_name: "aws-lambda"
     matrix_spec:
       ruby: 'ruby-3.2'