cleanup

Author: blink1073

.evergreen/config.yml

@@ -208,7 +208,7 @@ functions:
         working_dir: "src"
         include_expansions_in_env: [VERSION, TOPOLOGY, AUTH, SSL, ORCHESTRATION_FILE,
           STORAGE_ENGINE, REQUIRE_API_VERSION, DRIVERS_TOOLS, TEST_CRYPT_SHARED, AUTH_AWS, LOAD_BALANCER]
-        args: [.evergreen/just.sh, run server, "${TEST_NAME}", "${SUB_TEST_NAME}"]
+        args: [.evergreen/just.sh, run-server, "${TEST_NAME}", "${SUB_TEST_NAME}"]
     - command: expansions.update
       params:
         file: ${DRIVERS_TOOLS}/mo-expansion.yml

.evergreen/generated_configs/tasks.yml

@@ -797,50 +797,6 @@ tasks:
           OCSP_ALGORITHM: ecdsa
           OCSP_SERVER_TYPE: revoked-delegate
     tags: [ocsp, ocsp-ecdsa]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-singleEndpoint-valid
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: ecdsa
-          OCSP_SERVER_TYPE: valid
-    tags: [ocsp, ocsp-ecdsa, ocsp-staple]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-singleEndpoint-revoked
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: ecdsa
-          OCSP_SERVER_TYPE: revoked
-    tags: [ocsp, ocsp-ecdsa, ocsp-staple]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-singleEndpoint-valid-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: ecdsa
-          OCSP_SERVER_TYPE: valid-delegate
-    tags: [ocsp, ocsp-ecdsa, ocsp-staple]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-singleEndpoint-revoked-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: ecdsa
-          OCSP_SERVER_TYPE: revoked-delegate
-    tags: [ocsp, ocsp-ecdsa, ocsp-staple]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-valid
     commands:
       - func: run server
@@ -885,50 +841,6 @@ tasks:
           OCSP_ALGORITHM: ecdsa
           OCSP_SERVER_TYPE: revoked-delegate
     tags: [ocsp, ocsp-ecdsa, ocsp-staple]
-  - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-singleEndpoint-valid
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: rsa
-          OCSP_SERVER_TYPE: valid
-    tags: [ocsp, ocsp-rsa, ocsp-staple]
-  - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-singleEndpoint-revoked
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: rsa
-          OCSP_SERVER_TYPE: revoked
-    tags: [ocsp, ocsp-rsa, ocsp-staple]
-  - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-singleEndpoint-valid-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: rsa
-          OCSP_SERVER_TYPE: valid-delegate
-    tags: [ocsp, ocsp-rsa, ocsp-staple]
-  - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-singleEndpoint-revoked-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: rsa
-          OCSP_SERVER_TYPE: revoked-delegate
-    tags: [ocsp, ocsp-rsa, ocsp-staple]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-valid
     commands:
       - func: run server
@@ -1017,50 +929,6 @@ tasks:
           OCSP_ALGORITHM: rsa
           OCSP_SERVER_TYPE: revoked-delegate
     tags: [ocsp, ocsp-rsa, ocsp-staple]
-  - name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-singleEndpoint-valid
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: rsa
-          OCSP_SERVER_TYPE: valid
-    tags: [ocsp, ocsp-rsa]
-  - name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-singleEndpoint-revoked
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: rsa
-          OCSP_SERVER_TYPE: revoked
-    tags: [ocsp, ocsp-rsa]
-  - name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-singleEndpoint-valid-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: rsa
-          OCSP_SERVER_TYPE: valid-delegate
-    tags: [ocsp, ocsp-rsa]
-  - name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-singleEndpoint-revoked-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: rsa
-          OCSP_SERVER_TYPE: revoked-delegate
-    tags: [ocsp, ocsp-rsa]
   - name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-valid
     commands:
       - func: run server
@@ -1105,50 +973,6 @@ tasks:
           OCSP_ALGORITHM: rsa
           OCSP_SERVER_TYPE: revoked-delegate
     tags: [ocsp, ocsp-rsa]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-singleEndpoint-valid
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: ecdsa
-          OCSP_SERVER_TYPE: valid
-    tags: [ocsp, ocsp-ecdsa]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-singleEndpoint-revoked
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: ecdsa
-          OCSP_SERVER_TYPE: revoked
-    tags: [ocsp, ocsp-ecdsa]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-singleEndpoint-valid-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: ecdsa
-          OCSP_SERVER_TYPE: valid-delegate
-    tags: [ocsp, ocsp-ecdsa]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-singleEndpoint-revoked-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: ecdsa
-          OCSP_SERVER_TYPE: revoked-delegate
-    tags: [ocsp, ocsp-ecdsa]
   - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-valid
     commands:
       - func: run server
@@ -1193,94 +1017,6 @@ tasks:
           OCSP_ALGORITHM: rsa
           OCSP_SERVER_TYPE: revoked-delegate
     tags: [ocsp, ocsp-rsa, ocsp-staple]
-  - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint-valid
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: rsa
-          OCSP_SERVER_TYPE: valid
-    tags: [ocsp, ocsp-rsa, ocsp-staple]
-  - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint-revoked
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: rsa
-          OCSP_SERVER_TYPE: revoked
-    tags: [ocsp, ocsp-rsa, ocsp-staple]
-  - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint-valid-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: rsa
-          OCSP_SERVER_TYPE: valid-delegate
-    tags: [ocsp, ocsp-rsa, ocsp-staple]
-  - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint-revoked-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: rsa
-          OCSP_SERVER_TYPE: revoked-delegate
-    tags: [ocsp, ocsp-rsa, ocsp-staple]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint-valid
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: ecdsa
-          OCSP_SERVER_TYPE: valid
-    tags: [ocsp, ocsp-ecdsa, ocsp-staple]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint-revoked
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: ecdsa
-          OCSP_SERVER_TYPE: revoked
-    tags: [ocsp, ocsp-ecdsa, ocsp-staple]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint-valid-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: ecdsa
-          OCSP_SERVER_TYPE: valid-delegate
-    tags: [ocsp, ocsp-ecdsa, ocsp-staple]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint-revoked-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling-singleEndpoint.json
-      - func: run tests
-        vars:
-          OCSP_ALGORITHM: ecdsa
-          OCSP_SERVER_TYPE: revoked-delegate
-    tags: [ocsp, ocsp-ecdsa, ocsp-staple]
 
   # Server tests
   - name: test-4.0-standalone-auth-ssl-sync

.evergreen/scripts/generate_config.py

@@ -909,6 +909,8 @@ def create_ocsp_tasks():
     drivers_tools = os.environ["DRIVERS_TOOLS"]
     config_path = Path(drivers_tools) / ".evergreen/orchestration/configs/servers"
     for path in config_path.glob("*ocsp*"):
+        if "singleEndpoint" in path.name:
+            continue
         for server_type in ["valid", "revoked", "valid-delegate", "revoked-delegate"]:
             task = _create_ocsp_task(path.name, server_type)
             tasks.append(task)