update tasks

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -757,15 +757,15 @@ tasks:
     commands:
       - func: run tests
         vars:
-          OCSP_ALGORITHM: ecdsa
+          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
           OCSP_SERVER_TYPE: valid
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-ecdsa]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-revoked
     commands:
       - func: run tests
         vars:
-          OCSP_ALGORITHM: ecdsa
+          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
           OCSP_SERVER_TYPE: revoked
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-ecdsa]
@@ -777,23 +777,23 @@ tasks:
           ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
       - func: run tests
         vars:
-          OCSP_ALGORITHM: ecdsa
+          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
           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 tests
         vars:
-          OCSP_ALGORITHM: ecdsa
+          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 tests
         vars:
-          OCSP_ALGORITHM: ecdsa
+          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
           OCSP_SERVER_TYPE: revoked
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-ecdsa]
@@ -805,23 +805,23 @@ tasks:
           ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
       - func: run tests
         vars:
-          OCSP_ALGORITHM: ecdsa
+          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
           OCSP_SERVER_TYPE: no-responder
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-ecdsa]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-valid
     commands:
       - func: run tests
         vars:
-          OCSP_ALGORITHM: ecdsa
+          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
           OCSP_SERVER_TYPE: valid
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-ecdsa, ocsp-staple]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-revoked
     commands:
       - func: run tests
         vars:
-          OCSP_ALGORITHM: ecdsa
+          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
           OCSP_SERVER_TYPE: revoked
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-ecdsa, ocsp-staple]
@@ -833,39 +833,39 @@ tasks:
           ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
       - func: run tests
         vars:
-          OCSP_ALGORITHM: ecdsa
+          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
           OCSP_SERVER_TYPE: no-responder
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-ecdsa, ocsp-staple]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-valid-delegate
     commands:
       - func: run tests
         vars:
-          OCSP_ALGORITHM: ecdsa
+          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
           OCSP_SERVER_TYPE: valid-delegate
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-ecdsa, ocsp-staple]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-revoked-delegate
     commands:
       - func: run tests
         vars:
-          OCSP_ALGORITHM: ecdsa
+          ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
           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 tests
         vars:
-          OCSP_ALGORITHM: rsa
+          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 tests
         vars:
-          OCSP_ALGORITHM: rsa
+          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
           OCSP_SERVER_TYPE: revoked
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-rsa]
@@ -877,23 +877,23 @@ tasks:
           ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
       - func: run tests
         vars:
-          OCSP_ALGORITHM: rsa
+          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
           OCSP_SERVER_TYPE: no-responder
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-rsa]
   - name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-valid
     commands:
       - func: run tests
         vars:
-          OCSP_ALGORITHM: rsa
+          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
           OCSP_SERVER_TYPE: valid
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-rsa]
   - name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-revoked
     commands:
       - func: run tests
         vars:
-          OCSP_ALGORITHM: rsa
+          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
           OCSP_SERVER_TYPE: revoked
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-rsa]
@@ -905,23 +905,23 @@ tasks:
           ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
       - func: run tests
         vars:
-          OCSP_ALGORITHM: rsa
+          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
           OCSP_SERVER_TYPE: no-responder
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-rsa]
   - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-valid
     commands:
       - func: run tests
         vars:
-          OCSP_ALGORITHM: rsa
+          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
           OCSP_SERVER_TYPE: valid
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-rsa, ocsp-staple]
   - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-revoked
     commands:
       - func: run tests
         vars:
-          OCSP_ALGORITHM: rsa
+          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
           OCSP_SERVER_TYPE: revoked
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-rsa, ocsp-staple]
@@ -933,23 +933,23 @@ tasks:
           ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
       - func: run tests
         vars:
-          OCSP_ALGORITHM: rsa
+          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
           OCSP_SERVER_TYPE: no-responder
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-rsa, ocsp-staple]
   - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-valid-delegate
     commands:
       - func: run tests
         vars:
-          OCSP_ALGORITHM: rsa
+          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
           OCSP_SERVER_TYPE: valid-delegate
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-rsa, ocsp-staple]
   - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-revoked-delegate
     commands:
       - func: run tests
         vars:
-          OCSP_ALGORITHM: rsa
+          ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
           OCSP_SERVER_TYPE: revoked-delegate
           TEST_NAME: ocsp
     tags: [ocsp, ocsp-rsa, ocsp-staple]

.evergreen/scripts/generate_config.py

@@ -891,7 +891,7 @@ def _create_ocsp_task(file_name, server_type):
     vars = dict(TEST_NAME="ocsp", ORCHESTRATION_FILE=file_name)
     server_func = FunctionCall(func="run server", vars=vars)
 
-    vars = dict(OCSP_ALGORITHM=algo, OCSP_SERVER_TYPE=server_type, TEST_NAME="ocsp")
+    vars = dict(ORCHESTRATION_FILE=file_name, OCSP_SERVER_TYPE=server_type, TEST_NAME="ocsp")
     test_func = FunctionCall(func="run tests", vars=vars)
 
     tags = ["ocsp", f"ocsp-{algo}"]