update tasks

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -813,18 +813,6 @@ tasks:
           OCSP_SERVER_TYPE: no-responder
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-ecdsa]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-valid
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
-      - func: run tests
-        vars:
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
-          OCSP_SERVER_TYPE: valid
-          TEST_NAME: ocsp
-    tags: [ocsp, ocsp-ecdsa]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-revoked
     commands:
       - func: run server
@@ -837,18 +825,6 @@ tasks:
           OCSP_SERVER_TYPE: revoked
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-ecdsa]
-  - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-valid-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
-      - func: run tests
-        vars:
-          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
-          OCSP_SERVER_TYPE: valid-delegate
-          TEST_NAME: ocsp
-    tags: [ocsp, ocsp-ecdsa]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-revoked-delegate
     commands:
       - func: run server
@@ -921,18 +897,6 @@ tasks:
           OCSP_SERVER_TYPE: revoked-delegate
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-ecdsa, ocsp-staple]
-  - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-valid
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
-      - func: run tests
-        vars:
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
-          OCSP_SERVER_TYPE: valid
-          TEST_NAME: ocsp
-    tags: [ocsp, ocsp-rsa]
   - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-revoked
     commands:
       - func: run server
@@ -945,18 +909,6 @@ tasks:
           OCSP_SERVER_TYPE: revoked
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-rsa]
-  - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-valid-delegate
-    commands:
-      - func: run server
-        vars:
-          TEST_NAME: ocsp
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
-      - func: run tests
-        vars:
-          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
-          OCSP_SERVER_TYPE: valid-delegate
-          TEST_NAME: ocsp
-    tags: [ocsp, ocsp-rsa]
   - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-revoked-delegate
     commands:
       - func: run server

.evergreen/scripts/generate_config.py

@@ -913,6 +913,11 @@ def create_ocsp_tasks():
             continue
         # Handle the tests that start an OCSP server.
         for server_type in ["valid", "revoked", "valid-delegate", "revoked-delegate"]:
+            if (
+                "valid" in server_type
+                and "basic-tls-ocsp-mustStaple-disableStapling.json" in path.name
+            ):
+                continue
             task = _create_ocsp_task(path.name, server_type)
             tasks.append(task)
         # Soft Fail Test: No OCSP Responder + server that does not staple.