Skip to content

Commit b16806c

Browse files
blink1073blink1073
committed
update tasks
1 parent 76a9484 commit b16806c

File tree

2 files changed

+24
-91
lines changed

2 files changed

+24
-91
lines changed

‎.evergreen/generated_configs/tasks.yml

Lines changed: 20 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -769,22 +769,6 @@ tasks:
769769
OCSP_SERVER_TYPE: revoked
770770
TEST_NAME: ocsp
771771
tags: [ocsp, ocsp-ecdsa]
772-
- name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-valid-delegate
773-
commands:
774-
- func: run tests
775-
vars:
776-
OCSP_ALGORITHM: ecdsa
777-
OCSP_SERVER_TYPE: valid-delegate
778-
TEST_NAME: ocsp
779-
tags: [ocsp, ocsp-ecdsa]
780-
- name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-revoked-delegate
781-
commands:
782-
- func: run tests
783-
vars:
784-
OCSP_ALGORITHM: ecdsa
785-
OCSP_SERVER_TYPE: revoked-delegate
786-
TEST_NAME: ocsp
787-
tags: [ocsp, ocsp-ecdsa]
788772
- name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-no-responder
789773
commands:
790774
- func: run server
@@ -813,22 +797,6 @@ tasks:
813797
OCSP_SERVER_TYPE: revoked
814798
TEST_NAME: ocsp
815799
tags: [ocsp, ocsp-ecdsa]
816-
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-valid-delegate
817-
commands:
818-
- func: run tests
819-
vars:
820-
OCSP_ALGORITHM: ecdsa
821-
OCSP_SERVER_TYPE: valid-delegate
822-
TEST_NAME: ocsp
823-
tags: [ocsp, ocsp-ecdsa]
824-
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-revoked-delegate
825-
commands:
826-
- func: run tests
827-
vars:
828-
OCSP_ALGORITHM: ecdsa
829-
OCSP_SERVER_TYPE: revoked-delegate
830-
TEST_NAME: ocsp
831-
tags: [ocsp, ocsp-ecdsa]
832800
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-no-responder
833801
commands:
834802
- func: run server
@@ -857,32 +825,32 @@ tasks:
857825
OCSP_SERVER_TYPE: revoked
858826
TEST_NAME: ocsp
859827
tags: [ocsp, ocsp-ecdsa, ocsp-staple]
860-
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-valid-delegate
828+
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-no-responder
861829
commands:
830+
- func: run server
831+
vars:
832+
TEST_NAME: ocsp
833+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
862834
- func: run tests
863835
vars:
864836
OCSP_ALGORITHM: ecdsa
865-
OCSP_SERVER_TYPE: valid-delegate
837+
OCSP_SERVER_TYPE: no-responder
866838
TEST_NAME: ocsp
867839
tags: [ocsp, ocsp-ecdsa, ocsp-staple]
868-
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-revoked-delegate
840+
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-valid-delegate
869841
commands:
870842
- func: run tests
871843
vars:
872844
OCSP_ALGORITHM: ecdsa
873-
OCSP_SERVER_TYPE: revoked-delegate
845+
OCSP_SERVER_TYPE: valid-delegate
874846
TEST_NAME: ocsp
875847
tags: [ocsp, ocsp-ecdsa, ocsp-staple]
876-
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-no-responder
848+
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-revoked-delegate
877849
commands:
878-
- func: run server
879-
vars:
880-
TEST_NAME: ocsp
881-
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
882850
- func: run tests
883851
vars:
884852
OCSP_ALGORITHM: ecdsa
885-
OCSP_SERVER_TYPE: no-responder
853+
OCSP_SERVER_TYPE: revoked-delegate
886854
TEST_NAME: ocsp
887855
tags: [ocsp, ocsp-ecdsa, ocsp-staple]
888856
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-valid
@@ -901,22 +869,6 @@ tasks:
901869
OCSP_SERVER_TYPE: revoked
902870
TEST_NAME: ocsp
903871
tags: [ocsp, ocsp-rsa]
904-
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-valid-delegate
905-
commands:
906-
- func: run tests
907-
vars:
908-
OCSP_ALGORITHM: rsa
909-
OCSP_SERVER_TYPE: valid-delegate
910-
TEST_NAME: ocsp
911-
tags: [ocsp, ocsp-rsa]
912-
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-revoked-delegate
913-
commands:
914-
- func: run tests
915-
vars:
916-
OCSP_ALGORITHM: rsa
917-
OCSP_SERVER_TYPE: revoked-delegate
918-
TEST_NAME: ocsp
919-
tags: [ocsp, ocsp-rsa]
920872
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-no-responder
921873
commands:
922874
- func: run server
@@ -945,22 +897,6 @@ tasks:
945897
OCSP_SERVER_TYPE: revoked
946898
TEST_NAME: ocsp
947899
tags: [ocsp, ocsp-rsa]
948-
- name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-valid-delegate
949-
commands:
950-
- func: run tests
951-
vars:
952-
OCSP_ALGORITHM: rsa
953-
OCSP_SERVER_TYPE: valid-delegate
954-
TEST_NAME: ocsp
955-
tags: [ocsp, ocsp-rsa]
956-
- name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-revoked-delegate
957-
commands:
958-
- func: run tests
959-
vars:
960-
OCSP_ALGORITHM: rsa
961-
OCSP_SERVER_TYPE: revoked-delegate
962-
TEST_NAME: ocsp
963-
tags: [ocsp, ocsp-rsa]
964900
- name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-no-responder
965901
commands:
966902
- func: run server
@@ -989,32 +925,32 @@ tasks:
989925
OCSP_SERVER_TYPE: revoked
990926
TEST_NAME: ocsp
991927
tags: [ocsp, ocsp-rsa, ocsp-staple]
992-
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-valid-delegate
928+
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-no-responder
993929
commands:
930+
- func: run server
931+
vars:
932+
TEST_NAME: ocsp
933+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
994934
- func: run tests
995935
vars:
996936
OCSP_ALGORITHM: rsa
997-
OCSP_SERVER_TYPE: valid-delegate
937+
OCSP_SERVER_TYPE: no-responder
998938
TEST_NAME: ocsp
999939
tags: [ocsp, ocsp-rsa, ocsp-staple]
1000-
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-revoked-delegate
940+
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-valid-delegate
1001941
commands:
1002942
- func: run tests
1003943
vars:
1004944
OCSP_ALGORITHM: rsa
1005-
OCSP_SERVER_TYPE: revoked-delegate
945+
OCSP_SERVER_TYPE: valid-delegate
1006946
TEST_NAME: ocsp
1007947
tags: [ocsp, ocsp-rsa, ocsp-staple]
1008-
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-no-responder
948+
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-revoked-delegate
1009949
commands:
1010-
- func: run server
1011-
vars:
1012-
TEST_NAME: ocsp
1013-
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
1014950
- func: run tests
1015951
vars:
1016952
OCSP_ALGORITHM: rsa
1017-
OCSP_SERVER_TYPE: no-responder
953+
OCSP_SERVER_TYPE: revoked-delegate
1018954
TEST_NAME: ocsp
1019955
tags: [ocsp, ocsp-rsa, ocsp-staple]
1020956

‎.evergreen/scripts/generate_config.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -914,13 +914,10 @@ def create_ocsp_tasks():
914914
for path in config_path.glob("*ocsp*"):
915915
if "singleEndpoint" in path.name:
916916
continue
917-
for server_type in [
918-
"valid",
919-
"revoked",
920-
"valid-delegate",
921-
"revoked-delegate",
922-
"no-responder",
923-
]:
917+
server_types = ["valid", "revoked", "no-responder"]
918+
if "disableStapling" not in path.name:
919+
server_types.extend(["valid-delegate", "revoked-delegate"])
920+
for server_type in server_types:
924921
task = _create_ocsp_task(path.name, server_type)
925922
tasks.append(task)
926923

0 commit comments

Comments
 (0)