Skip to content

Commit 2590893

Browse files
blink1073blink1073
committed
update tasks
1 parent dd42342 commit 2590893

File tree

3 files changed

+67
-26
lines changed

3 files changed

+67
-26
lines changed

‎.evergreen/generated_configs/tasks.yml

Lines changed: 64 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,10 @@ tasks:
755755
# Ocsp tests
756756
- name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-valid
757757
commands:
758+
- func: run server
759+
vars:
760+
TEST_NAME: ocsp
761+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
758762
- func: run tests
759763
vars:
760764
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
@@ -763,6 +767,10 @@ tasks:
763767
tags: [ocsp, ocsp-ecdsa]
764768
- name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-revoked
765769
commands:
770+
- func: run server
771+
vars:
772+
TEST_NAME: ocsp
773+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
766774
- func: run tests
767775
vars:
768776
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
@@ -771,10 +779,6 @@ tasks:
771779
tags: [ocsp, ocsp-ecdsa]
772780
- name: test-ocsp-ecdsa-basic-tls-ocsp-disableStapling-no-responder
773781
commands:
774-
- func: run server
775-
vars:
776-
TEST_NAME: ocsp
777-
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
778782
- func: run tests
779783
vars:
780784
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-disableStapling.json
@@ -783,6 +787,10 @@ tasks:
783787
tags: [ocsp, ocsp-ecdsa]
784788
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-valid
785789
commands:
790+
- func: run server
791+
vars:
792+
TEST_NAME: ocsp
793+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
786794
- func: run tests
787795
vars:
788796
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
@@ -791,6 +799,10 @@ tasks:
791799
tags: [ocsp, ocsp-ecdsa]
792800
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-revoked
793801
commands:
802+
- func: run server
803+
vars:
804+
TEST_NAME: ocsp
805+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
794806
- func: run tests
795807
vars:
796808
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
@@ -799,10 +811,6 @@ tasks:
799811
tags: [ocsp, ocsp-ecdsa]
800812
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-disableStapling-no-responder
801813
commands:
802-
- func: run server
803-
vars:
804-
TEST_NAME: ocsp
805-
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
806814
- func: run tests
807815
vars:
808816
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple-disableStapling.json
@@ -811,6 +819,10 @@ tasks:
811819
tags: [ocsp, ocsp-ecdsa]
812820
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-valid
813821
commands:
822+
- func: run server
823+
vars:
824+
TEST_NAME: ocsp
825+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
814826
- func: run tests
815827
vars:
816828
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
@@ -819,6 +831,10 @@ tasks:
819831
tags: [ocsp, ocsp-ecdsa, ocsp-staple]
820832
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-revoked
821833
commands:
834+
- func: run server
835+
vars:
836+
TEST_NAME: ocsp
837+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
822838
- func: run tests
823839
vars:
824840
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
@@ -827,10 +843,6 @@ tasks:
827843
tags: [ocsp, ocsp-ecdsa, ocsp-staple]
828844
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-no-responder
829845
commands:
830-
- func: run server
831-
vars:
832-
TEST_NAME: ocsp
833-
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
834846
- func: run tests
835847
vars:
836848
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
@@ -839,6 +851,10 @@ tasks:
839851
tags: [ocsp, ocsp-ecdsa, ocsp-staple]
840852
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-valid-delegate
841853
commands:
854+
- func: run server
855+
vars:
856+
TEST_NAME: ocsp
857+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
842858
- func: run tests
843859
vars:
844860
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
@@ -847,6 +863,10 @@ tasks:
847863
tags: [ocsp, ocsp-ecdsa, ocsp-staple]
848864
- name: test-ocsp-ecdsa-basic-tls-ocsp-mustStaple-revoked-delegate
849865
commands:
866+
- func: run server
867+
vars:
868+
TEST_NAME: ocsp
869+
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
850870
- func: run tests
851871
vars:
852872
ORCHESTRATION_FILE: ecdsa-basic-tls-ocsp-mustStaple.json
@@ -855,6 +875,10 @@ tasks:
855875
tags: [ocsp, ocsp-ecdsa, ocsp-staple]
856876
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-valid
857877
commands:
878+
- func: run server
879+
vars:
880+
TEST_NAME: ocsp
881+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
858882
- func: run tests
859883
vars:
860884
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
@@ -863,6 +887,10 @@ tasks:
863887
tags: [ocsp, ocsp-rsa]
864888
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-revoked
865889
commands:
890+
- func: run server
891+
vars:
892+
TEST_NAME: ocsp
893+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
866894
- func: run tests
867895
vars:
868896
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
@@ -871,10 +899,6 @@ tasks:
871899
tags: [ocsp, ocsp-rsa]
872900
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-disableStapling-no-responder
873901
commands:
874-
- func: run server
875-
vars:
876-
TEST_NAME: ocsp
877-
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
878902
- func: run tests
879903
vars:
880904
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple-disableStapling.json
@@ -883,6 +907,10 @@ tasks:
883907
tags: [ocsp, ocsp-rsa]
884908
- name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-valid
885909
commands:
910+
- func: run server
911+
vars:
912+
TEST_NAME: ocsp
913+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
886914
- func: run tests
887915
vars:
888916
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
@@ -891,6 +919,10 @@ tasks:
891919
tags: [ocsp, ocsp-rsa]
892920
- name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-revoked
893921
commands:
922+
- func: run server
923+
vars:
924+
TEST_NAME: ocsp
925+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
894926
- func: run tests
895927
vars:
896928
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
@@ -899,10 +931,6 @@ tasks:
899931
tags: [ocsp, ocsp-rsa]
900932
- name: test-ocsp-rsa-basic-tls-ocsp-disableStapling-no-responder
901933
commands:
902-
- func: run server
903-
vars:
904-
TEST_NAME: ocsp
905-
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
906934
- func: run tests
907935
vars:
908936
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-disableStapling.json
@@ -911,6 +939,10 @@ tasks:
911939
tags: [ocsp, ocsp-rsa]
912940
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-valid
913941
commands:
942+
- func: run server
943+
vars:
944+
TEST_NAME: ocsp
945+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
914946
- func: run tests
915947
vars:
916948
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
@@ -919,6 +951,10 @@ tasks:
919951
tags: [ocsp, ocsp-rsa, ocsp-staple]
920952
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-revoked
921953
commands:
954+
- func: run server
955+
vars:
956+
TEST_NAME: ocsp
957+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
922958
- func: run tests
923959
vars:
924960
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
@@ -927,10 +963,6 @@ tasks:
927963
tags: [ocsp, ocsp-rsa, ocsp-staple]
928964
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-no-responder
929965
commands:
930-
- func: run server
931-
vars:
932-
TEST_NAME: ocsp
933-
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
934966
- func: run tests
935967
vars:
936968
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
@@ -939,6 +971,10 @@ tasks:
939971
tags: [ocsp, ocsp-rsa, ocsp-staple]
940972
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-valid-delegate
941973
commands:
974+
- func: run server
975+
vars:
976+
TEST_NAME: ocsp
977+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
942978
- func: run tests
943979
vars:
944980
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
@@ -947,6 +983,10 @@ tasks:
947983
tags: [ocsp, ocsp-rsa, ocsp-staple]
948984
- name: test-ocsp-rsa-basic-tls-ocsp-mustStaple-revoked-delegate
949985
commands:
986+
- func: run server
987+
vars:
988+
TEST_NAME: ocsp
989+
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json
950990
- func: run tests
951991
vars:
952992
ORCHESTRATION_FILE: rsa-basic-tls-ocsp-mustStaple.json

‎.evergreen/scripts/generate_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -901,9 +901,9 @@ def _create_ocsp_task(file_name, server_type):
901901
name = file_name.replace(".json", "")
902902
task_name = f"test-ocsp-{name}-{server_type}"
903903
if server_type == "no-responder":
904-
commands = [server_func, test_func]
905-
else:
906904
commands = [test_func]
905+
else:
906+
commands = [server_func, test_func]
907907
return EvgTask(name=task_name, tags=tags, commands=commands)
908908

909909

‎.evergreen/scripts/run_server.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ def start_server():
3333
set_env("LOAD_BALANCER")
3434

3535
elif test_name == "ocsp":
36+
opts.ssl = True
3637
if "ORCHESTRATION_FILE" not in os.environ:
3738
found = False
3839
for opt in extra_opts:

0 commit comments

Comments
 (0)