update tasks

Author: blink1073

.evergreen/generated_configs/tasks.yml

@@ -804,31 +804,31 @@ tasks:
           OCSP_ALGORITHM: ecdsa
           OCSP_SERVER_TYPE: valid
           TEST_NAME: ocsp
-    tags: [ocsp, ocsp-ecdsa, ocsp-staple]
+    tags: [ocsp, ocsp-ecdsa]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-revoked
     commands:
       - func: run tests
         vars:
           OCSP_ALGORITHM: ecdsa
           OCSP_SERVER_TYPE: revoked
           TEST_NAME: ocsp
-    tags: [ocsp, ocsp-ecdsa, ocsp-staple]
+    tags: [ocsp, ocsp-ecdsa]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-valid-delegate
     commands:
       - func: run tests
         vars:
           OCSP_ALGORITHM: ecdsa
           OCSP_SERVER_TYPE: valid-delegate
           TEST_NAME: ocsp
-    tags: [ocsp, ocsp-ecdsa, ocsp-staple]
+    tags: [ocsp, ocsp-ecdsa]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-revoked-delegate
     commands:
       - func: run tests
         vars:
           OCSP_ALGORITHM: ecdsa
           OCSP_SERVER_TYPE: revoked-delegate
           TEST_NAME: ocsp
-    tags: [ocsp, ocsp-ecdsa, ocsp-staple]
+    tags: [ocsp, ocsp-ecdsa]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-no-responder
     commands:
       - func: run server
@@ -840,7 +840,7 @@ tasks:
           OCSP_ALGORITHM: ecdsa
           OCSP_SERVER_TYPE: no-responder
           TEST_NAME: ocsp
-    tags: [ocsp, ocsp-ecdsa, ocsp-staple]
+    tags: [ocsp, ocsp-ecdsa]
   - name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-valid
     commands:
       - func: run tests
@@ -892,31 +892,31 @@ tasks:
           OCSP_ALGORITHM: rsa
           OCSP_SERVER_TYPE: valid
           TEST_NAME: ocsp
-    tags: [ocsp, ocsp-rsa, ocsp-staple]
+    tags: [ocsp, ocsp-rsa]
   - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-revoked
     commands:
       - func: run tests
         vars:
           OCSP_ALGORITHM: rsa
           OCSP_SERVER_TYPE: revoked
           TEST_NAME: ocsp
-    tags: [ocsp, ocsp-rsa, ocsp-staple]
+    tags: [ocsp, ocsp-rsa]
   - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-valid-delegate
     commands:
       - func: run tests
         vars:
           OCSP_ALGORITHM: rsa
           OCSP_SERVER_TYPE: valid-delegate
           TEST_NAME: ocsp
-    tags: [ocsp, ocsp-rsa, ocsp-staple]
+    tags: [ocsp, ocsp-rsa]
   - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-revoked-delegate
     commands:
       - func: run tests
         vars:
           OCSP_ALGORITHM: rsa
           OCSP_SERVER_TYPE: revoked-delegate
           TEST_NAME: ocsp
-    tags: [ocsp, ocsp-rsa, ocsp-staple]
+    tags: [ocsp, ocsp-rsa]
   - name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-no-responder
     commands:
       - func: run server
@@ -928,7 +928,7 @@ tasks:
           OCSP_ALGORITHM: rsa
           OCSP_SERVER_TYPE: no-responder
           TEST_NAME: ocsp
-    tags: [ocsp, ocsp-rsa, ocsp-staple]
+    tags: [ocsp, ocsp-rsa]
   - name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-valid
     commands:
       - func: run tests

.evergreen/scripts/generate_config.py

@@ -895,7 +895,7 @@ def _create_ocsp_task(file_name, server_type):
     test_func = FunctionCall(func="run tests", vars=vars)
 
     tags = ["ocsp", f"ocsp-{algo}"]
-    if "mustStaple" in file_name:
+    if "disableStapling" not in file_name:
         tags.append("ocsp-staple")
 
     name = file_name.replace(".json", "")