File tree Expand file tree Collapse file tree 2 files changed +2
-29
lines changed Expand file tree Collapse file tree 2 files changed +2
-29
lines changed Original file line number Diff line number Diff line change @@ -432,9 +432,6 @@ functions:
432
432
if [ -n "${test_serverless}" ]; then
433
433
export TEST_SERVERLESS=1
434
434
fi
435
- if [ -n "${IS_SERVERLESS_PROXY}" ]; then
436
- export IS_SERVERLESS_PROXY=1
437
- fi
438
435
if [ -n "${TEST_INDEX_MANAGEMENT}" ]; then
439
436
export TEST_INDEX_MANAGEMENT=1
440
437
fi
@@ -2600,18 +2597,11 @@ axes:
2600
2597
- id : serverless
2601
2598
display_name : " Serverless"
2602
2599
values :
2603
- - id : " original "
2600
+ - id : " enabled "
2604
2601
display_name : " Serverless"
2605
2602
variables :
2606
2603
test_serverless : true
2607
2604
batchtime : 10080 # 7 days
2608
- - id : " proxy"
2609
- display_name : " Serverless Proxy"
2610
- variables :
2611
- test_serverless : true
2612
- VAULT_NAME : " serverless_next"
2613
- IS_SERVERLESS_PROXY : true
2614
- batchtime : 10080 # 7 days
2615
2605
2616
2606
buildvariants :
2617
2607
- matrix_name : " tests-fips"
@@ -3012,17 +3002,7 @@ buildvariants:
3012
3002
platform : rhel8
3013
3003
python-version : " *"
3014
3004
auth-ssl : auth-ssl
3015
- serverless : " original"
3016
- display_name : " ${serverless} ${python-version} ${platform}"
3017
- tasks :
3018
- - " serverless_task_group"
3019
-
3020
- - matrix_name : " serverless_proxy"
3021
- matrix_spec :
3022
- platform : rhel8
3023
- python-version : ["3.8", "3.10"]
3024
- auth-ssl : auth-ssl
3025
- serverless : " proxy"
3005
+ serverless : " enabled"
3026
3006
display_name : " ${serverless} ${python-version} ${platform}"
3027
3007
tasks :
3028
3008
- " serverless_task_group"
Original file line number Diff line number Diff line change @@ -1048,7 +1048,6 @@ def setUp(self):
1048
1048
1049
1049
# initialize internals
1050
1050
self .match_evaluator = MatchEvaluatorUtil (self )
1051
- self .IS_SERVERLESS_PROXY = os .environ .get ("IS_SERVERLESS_PROXY" )
1052
1051
1053
1052
def maybe_skip_test (self , spec ):
1054
1053
# add any special-casing for skipping tests here
@@ -1075,12 +1074,6 @@ def maybe_skip_test(self, spec):
1075
1074
if "unpin after non-transient error on abort" in spec ["description" ]:
1076
1075
if client_context .version [0 ] == 8 :
1077
1076
self .skipTest ("Skipping TransientTransactionError pending PYTHON-4182" )
1078
- if self .IS_SERVERLESS_PROXY is not None and (
1079
- "errors during the initial connection hello are ignored" in spec ["description" ]
1080
- or "pinned connection is released after a transient network commit error"
1081
- in spec ["description" ]
1082
- ):
1083
- self .skipTest ("waiting on CLOUDP-202309" )
1084
1077
1085
1078
class_name = self .__class__ .__name__ .lower ()
1086
1079
description = spec ["description" ].lower ()
You can’t perform that action at this time.
0 commit comments