Skip to content

Commit 0a0d697

Browse files
blink1073blink1073
committed
remove changes to load balancer
1 parent 8529e71 commit 0a0d697

File tree

3 files changed

+67
-199
lines changed

3 files changed

+67
-199
lines changed

‎.evergreen/generated_configs/tasks.yml

Lines changed: 3 additions & 186 deletions
Original file line numberDiff line numberDiff line change
@@ -805,225 +805,42 @@ tasks:
805805
SUB_TEST_NAME: azure-fail
806806

807807
# Load balancer tests
808-
- name: test-load-balancer-auth-ssl-v6.0
808+
- name: test-load-balancer-auth-ssl
809809
commands:
810810
- func: run server
811811
vars:
812812
TOPOLOGY: sharded_cluster
813813
AUTH: auth
814814
SSL: ssl
815815
TEST_NAME: load_balancer
816-
VERSION: "6.0"
817-
- func: run tests
818-
vars:
819-
AUTH: auth
820-
SSL: ssl
821-
TEST_NAME: load_balancer
822-
tags: [load-balancer, auth, ssl]
823-
- name: test-load-balancer-auth-ssl-v7.0
824-
commands:
825-
- func: run server
826-
vars:
827-
TOPOLOGY: sharded_cluster
828-
AUTH: auth
829-
SSL: ssl
830-
TEST_NAME: load_balancer
831-
VERSION: "7.0"
832-
- func: run tests
833-
vars:
834-
AUTH: auth
835-
SSL: ssl
836-
TEST_NAME: load_balancer
837-
tags: [load-balancer, auth, ssl]
838-
- name: test-load-balancer-auth-ssl-v8.0
839-
commands:
840-
- func: run server
841-
vars:
842-
TOPOLOGY: sharded_cluster
843-
AUTH: auth
844-
SSL: ssl
845-
TEST_NAME: load_balancer
846-
VERSION: "8.0"
847-
- func: run tests
848-
vars:
849-
AUTH: auth
850-
SSL: ssl
851-
TEST_NAME: load_balancer
852-
tags: [load-balancer, auth, ssl]
853-
- name: test-load-balancer-auth-ssl-rapid
854-
commands:
855-
- func: run server
856-
vars:
857-
TOPOLOGY: sharded_cluster
858-
AUTH: auth
859-
SSL: ssl
860-
TEST_NAME: load_balancer
861-
VERSION: rapid
862816
- func: run tests
863817
vars:
864818
AUTH: auth
865819
SSL: ssl
866820
TEST_NAME: load_balancer
867821
tags: [load-balancer, auth, ssl]
868-
- name: test-load-balancer-auth-ssl-latest
869-
commands:
870-
- func: run server
871-
vars:
872-
TOPOLOGY: sharded_cluster
873-
AUTH: auth
874-
SSL: ssl
875-
TEST_NAME: load_balancer
876-
VERSION: latest
877-
- func: run tests
878-
vars:
879-
AUTH: auth
880-
SSL: ssl
881-
TEST_NAME: load_balancer
882-
tags: [load-balancer, auth, ssl]
883-
- name: test-load-balancer-noauth-ssl-v6.0
822+
- name: test-load-balancer-noauth-ssl
884823
commands:
885824
- func: run server
886825
vars:
887826
TOPOLOGY: sharded_cluster
888827
AUTH: noauth
889828
SSL: ssl
890829
TEST_NAME: load_balancer
891-
VERSION: "6.0"
892-
- func: run tests
893-
vars:
894-
AUTH: noauth
895-
SSL: ssl
896-
TEST_NAME: load_balancer
897-
tags: [load-balancer, noauth, ssl]
898-
- name: test-load-balancer-noauth-ssl-v7.0
899-
commands:
900-
- func: run server
901-
vars:
902-
TOPOLOGY: sharded_cluster
903-
AUTH: noauth
904-
SSL: ssl
905-
TEST_NAME: load_balancer
906-
VERSION: "7.0"
907-
- func: run tests
908-
vars:
909-
AUTH: noauth
910-
SSL: ssl
911-
TEST_NAME: load_balancer
912-
tags: [load-balancer, noauth, ssl]
913-
- name: test-load-balancer-noauth-ssl-v8.0
914-
commands:
915-
- func: run server
916-
vars:
917-
TOPOLOGY: sharded_cluster
918-
AUTH: noauth
919-
SSL: ssl
920-
TEST_NAME: load_balancer
921-
VERSION: "8.0"
922830
- func: run tests
923831
vars:
924832
AUTH: noauth
925833
SSL: ssl
926834
TEST_NAME: load_balancer
927835
tags: [load-balancer, noauth, ssl]
928-
- name: test-load-balancer-noauth-ssl-rapid
929-
commands:
930-
- func: run server
931-
vars:
932-
TOPOLOGY: sharded_cluster
933-
AUTH: noauth
934-
SSL: ssl
935-
TEST_NAME: load_balancer
936-
VERSION: rapid
937-
- func: run tests
938-
vars:
939-
AUTH: noauth
940-
SSL: ssl
941-
TEST_NAME: load_balancer
942-
tags: [load-balancer, noauth, ssl]
943-
- name: test-load-balancer-noauth-ssl-latest
944-
commands:
945-
- func: run server
946-
vars:
947-
TOPOLOGY: sharded_cluster
948-
AUTH: noauth
949-
SSL: ssl
950-
TEST_NAME: load_balancer
951-
VERSION: latest
952-
- func: run tests
953-
vars:
954-
AUTH: noauth
955-
SSL: ssl
956-
TEST_NAME: load_balancer
957-
tags: [load-balancer, noauth, ssl]
958-
- name: test-load-balancer-noauth-nossl-v6.0
836+
- name: test-load-balancer-noauth-nossl
959837
commands:
960838
- func: run server
961839
vars:
962840
TOPOLOGY: sharded_cluster
963841
AUTH: noauth
964842
SSL: nossl
965843
TEST_NAME: load_balancer
966-
VERSION: "6.0"
967-
- func: run tests
968-
vars:
969-
AUTH: noauth
970-
SSL: nossl
971-
TEST_NAME: load_balancer
972-
tags: [load-balancer, noauth, nossl]
973-
- name: test-load-balancer-noauth-nossl-v7.0
974-
commands:
975-
- func: run server
976-
vars:
977-
TOPOLOGY: sharded_cluster
978-
AUTH: noauth
979-
SSL: nossl
980-
TEST_NAME: load_balancer
981-
VERSION: "7.0"
982-
- func: run tests
983-
vars:
984-
AUTH: noauth
985-
SSL: nossl
986-
TEST_NAME: load_balancer
987-
tags: [load-balancer, noauth, nossl]
988-
- name: test-load-balancer-noauth-nossl-v8.0
989-
commands:
990-
- func: run server
991-
vars:
992-
TOPOLOGY: sharded_cluster
993-
AUTH: noauth
994-
SSL: nossl
995-
TEST_NAME: load_balancer
996-
VERSION: "8.0"
997-
- func: run tests
998-
vars:
999-
AUTH: noauth
1000-
SSL: nossl
1001-
TEST_NAME: load_balancer
1002-
tags: [load-balancer, noauth, nossl]
1003-
- name: test-load-balancer-noauth-nossl-rapid
1004-
commands:
1005-
- func: run server
1006-
vars:
1007-
TOPOLOGY: sharded_cluster
1008-
AUTH: noauth
1009-
SSL: nossl
1010-
TEST_NAME: load_balancer
1011-
VERSION: rapid
1012-
- func: run tests
1013-
vars:
1014-
AUTH: noauth
1015-
SSL: nossl
1016-
TEST_NAME: load_balancer
1017-
tags: [load-balancer, noauth, nossl]
1018-
- name: test-load-balancer-noauth-nossl-latest
1019-
commands:
1020-
- func: run server
1021-
vars:
1022-
TOPOLOGY: sharded_cluster
1023-
AUTH: noauth
1024-
SSL: nossl
1025-
TEST_NAME: load_balancer
1026-
VERSION: latest
1027844
- func: run tests
1028845
vars:
1029846
AUTH: noauth

‎.evergreen/generated_configs/variants.yml

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,13 +588,56 @@ buildvariants:
588588
PYTHON_BINARY: /opt/python/3.13/bin/python3
589589

590590
# Load balancer tests
591-
- name: load-balancer
591+
- name: load-balancer-rhel8-v6.0-python3.9
592592
tasks:
593593
- name: .load-balancer
594-
display_name: Load Balancer
594+
display_name: Load Balancer RHEL8 v6.0 Python3.9
595595
run_on:
596596
- rhel87-small
597597
batchtime: 10080
598+
expansions:
599+
VERSION: "6.0"
600+
PYTHON_BINARY: /opt/python/3.9/bin/python3
601+
- name: load-balancer-rhel8-v7.0-python3.9
602+
tasks:
603+
- name: .load-balancer
604+
display_name: Load Balancer RHEL8 v7.0 Python3.9
605+
run_on:
606+
- rhel87-small
607+
batchtime: 10080
608+
expansions:
609+
VERSION: "7.0"
610+
PYTHON_BINARY: /opt/python/3.9/bin/python3
611+
- name: load-balancer-rhel8-v8.0-python3.9
612+
tasks:
613+
- name: .load-balancer
614+
display_name: Load Balancer RHEL8 v8.0 Python3.9
615+
run_on:
616+
- rhel87-small
617+
batchtime: 10080
618+
expansions:
619+
VERSION: "8.0"
620+
PYTHON_BINARY: /opt/python/3.9/bin/python3
621+
- name: load-balancer-rhel8-rapid-python3.9
622+
tasks:
623+
- name: .load-balancer
624+
display_name: Load Balancer RHEL8 rapid Python3.9
625+
run_on:
626+
- rhel87-small
627+
batchtime: 10080
628+
expansions:
629+
VERSION: rapid
630+
PYTHON_BINARY: /opt/python/3.9/bin/python3
631+
- name: load-balancer-rhel8-latest-python3.9
632+
tasks:
633+
- name: .load-balancer
634+
display_name: Load Balancer RHEL8 latest Python3.9
635+
run_on:
636+
- rhel87-small
637+
batchtime: 10080
638+
expansions:
639+
VERSION: latest
640+
PYTHON_BINARY: /opt/python/3.9/bin/python3
598641

599642
# Mockupdb tests
600643
- name: mockupdb-rhel8-python3.9

‎.evergreen/scripts/generate_config.py

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -414,11 +414,23 @@ def get_encryption_expansions(encryption):
414414

415415
def create_load_balancer_variants():
416416
# Load balancer tests - run all supported server versions using the lowest supported python.
417-
return [
418-
create_variant(
419-
[".load-balancer"], "Load Balancer", host=DEFAULT_HOST, batchtime=BATCHTIME_WEEK
417+
host = DEFAULT_HOST
418+
batchtime = BATCHTIME_WEEK
419+
versions = get_versions_from("6.0")
420+
variants = []
421+
for version in versions:
422+
python = CPYTHONS[0]
423+
display_name = get_variant_name("Load Balancer", host, python=python, version=version)
424+
variant = create_variant(
425+
[".load-balancer"],
426+
display_name,
427+
python=python,
428+
host=host,
429+
version=version,
430+
batchtime=batchtime,
420431
)
421-
]
432+
variants.append(variant)
433+
return variants
422434

423435

424436
def create_compression_variants():
@@ -811,15 +823,11 @@ def create_server_tasks():
811823

812824
def create_load_balancer_tasks():
813825
tasks = []
814-
for (auth, ssl), version in product(AUTH_SSLS, get_versions_from("6.0")):
815-
name = get_task_name(f"test-load-balancer-{auth}-{ssl}", version=version)
826+
for auth, ssl in AUTH_SSLS:
827+
name = f"test-load-balancer-{auth}-{ssl}".lower()
816828
tags = ["load-balancer", auth, ssl]
817829
server_vars = dict(
818-
TOPOLOGY="sharded_cluster",
819-
AUTH=auth,
820-
SSL=ssl,
821-
TEST_NAME="load_balancer",
822-
VERSION=version,
830+
TOPOLOGY="sharded_cluster", AUTH=auth, SSL=ssl, TEST_NAME="load_balancer"
823831
)
824832
server_func = FunctionCall(func="run server", vars=server_vars)
825833
test_vars = dict(AUTH=auth, SSL=ssl, TEST_NAME="load_balancer")

0 commit comments

Comments
 (0)