Skip to content

Commit fbb742e

Browse files
PavelSafronovPavelSafronov
authored
Merge branch 'main' into NODE-7315 
2 parents 82a34bb + bf75181 commit fbb742e

6 files changed

Lines changed: 83 additions & 42 deletions

File tree

‎.evergreen/ci_matrix_constants.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const LB_VERSIONS = MONGODB_VERSIONS.slice(0, MONGODB_VERSIONS.indexOf('5.0') +
1515
LB_VERSIONS.reverse();
1616

1717
const DEFAULT_OS = 'rhel80-large';
18-
const WINDOWS_OS = 'windows-vsCurrent-large';
18+
const WINDOWS_OS = 'windows-2022-latest-large';
1919
const MACOS_OS = 'macos-14-arm64';
2020
const UBUNTU_OS = 'ubuntu1804-large';
2121
const UBUNTU_20_OS = 'ubuntu2004-small';

‎.evergreen/config.in.yml‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1054,28 +1054,27 @@ task_groups:
10541054
tasks:
10551055
- oidc-auth-test-k8s-latest-gke
10561056

1057-
# TODO(NODE-7358): unskip broken k8s tests
1058-
# - name: testk8soidc_task_group_aks
1059-
# setup_group:
1060-
# - func: fetch source
1061-
# - func: assume secrets manager role
1062-
# - command: subprocess.exec
1063-
# params:
1064-
# binary: bash
1065-
# add_expansions_to_env: true
1066-
# args:
1067-
# - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
1068-
# teardown_group:
1069-
# - func: "upload coverage report"
1070-
# - command: subprocess.exec
1071-
# params:
1072-
# binary: bash
1073-
# args:
1074-
# - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
1075-
# setup_group_can_fail_task: true
1076-
# setup_group_timeout_secs: 1800
1077-
# tasks:
1078-
# - oidc-auth-test-k8s-latest-aks
1057+
- name: testk8soidc_task_group_aks
1058+
setup_group:
1059+
- func: fetch source
1060+
- func: assume secrets manager role
1061+
- command: subprocess.exec
1062+
params:
1063+
binary: bash
1064+
add_expansions_to_env: true
1065+
args:
1066+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
1067+
teardown_group:
1068+
- func: "upload coverage report"
1069+
- command: subprocess.exec
1070+
params:
1071+
binary: bash
1072+
args:
1073+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
1074+
setup_group_can_fail_task: true
1075+
setup_group_timeout_secs: 1800
1076+
tasks:
1077+
- oidc-auth-test-k8s-latest-aks
10791078

10801079
- name: testtestoidc_task_group
10811080
setup_group:

‎.evergreen/config.yml‎

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2682,6 +2682,27 @@ task_groups:
26822682
setup_group_timeout_secs: 1800
26832683
tasks:
26842684
- oidc-auth-test-k8s-latest-gke
2685+
- name: testk8soidc_task_group_aks
2686+
setup_group:
2687+
- func: fetch source
2688+
- func: assume secrets manager role
2689+
- command: subprocess.exec
2690+
params:
2691+
binary: bash
2692+
add_expansions_to_env: true
2693+
args:
2694+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/setup.sh
2695+
teardown_group:
2696+
- func: upload coverage report
2697+
- command: subprocess.exec
2698+
params:
2699+
binary: bash
2700+
args:
2701+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/k8s/teardown.sh
2702+
setup_group_can_fail_task: true
2703+
setup_group_timeout_secs: 1800
2704+
tasks:
2705+
- oidc-auth-test-k8s-latest-aks
26852706
- name: testtestoidc_task_group
26862707
setup_group:
26872708
- func: fetch source
@@ -3055,14 +3076,17 @@ buildvariants:
30553076
- test-tls-support-5.0
30563077
- test-tls-support-4.4
30573078
- test-tls-support-4.2
3058-
- name: windows-vsCurrent-large-iron
3079+
- name: windows-2022-latest-large-iron
30593080
display_name: Windows Node20.19.0
3060-
run_on: windows-vsCurrent-large
3081+
run_on: windows-2022-latest-large
30613082
expansions:
30623083
NODE_LTS_VERSION: 20.19.0
30633084
CLIENT_ENCRYPTION: 'false'
30643085
TEST_CSFLE: 'false'
30653086
tasks:
3087+
- test-latest-server
3088+
- test-latest-replica_set
3089+
- test-latest-sharded_cluster
30663090
- test-rapid-server
30673091
- test-rapid-replica_set
30683092
- test-rapid-sharded_cluster
@@ -3084,20 +3108,29 @@ buildvariants:
30843108
- test-4.2-server
30853109
- test-4.2-replica_set
30863110
- test-4.2-sharded_cluster
3111+
- test-latest-server-v1-api
3112+
- test-socks5
3113+
- test-socks5-tls
3114+
- test-snappy-compression
3115+
- test-zstd-compression
3116+
- test-tls-support-latest
30873117
- test-tls-support-8.0
30883118
- test-tls-support-7.0
30893119
- test-tls-support-6.0
30903120
- test-tls-support-5.0
30913121
- test-tls-support-4.4
30923122
- test-tls-support-4.2
3093-
- name: windows-vsCurrent-large-Node22
3123+
- name: windows-2022-latest-large-Node22
30943124
display_name: Windows Node22
3095-
run_on: windows-vsCurrent-large
3125+
run_on: windows-2022-latest-large
30963126
expansions:
30973127
NODE_LTS_VERSION: 22
30983128
CLIENT_ENCRYPTION: 'false'
30993129
TEST_CSFLE: 'false'
31003130
tasks:
3131+
- test-latest-server
3132+
- test-latest-replica_set
3133+
- test-latest-sharded_cluster
31013134
- test-rapid-server
31023135
- test-rapid-replica_set
31033136
- test-rapid-sharded_cluster
@@ -3119,20 +3152,29 @@ buildvariants:
31193152
- test-4.2-server
31203153
- test-4.2-replica_set
31213154
- test-4.2-sharded_cluster
3155+
- test-latest-server-v1-api
3156+
- test-socks5
3157+
- test-socks5-tls
3158+
- test-snappy-compression
3159+
- test-zstd-compression
3160+
- test-tls-support-latest
31223161
- test-tls-support-8.0
31233162
- test-tls-support-7.0
31243163
- test-tls-support-6.0
31253164
- test-tls-support-5.0
31263165
- test-tls-support-4.4
31273166
- test-tls-support-4.2
3128-
- name: windows-vsCurrent-large-Node24
3167+
- name: windows-2022-latest-large-Node24
31293168
display_name: Windows Node24
3130-
run_on: windows-vsCurrent-large
3169+
run_on: windows-2022-latest-large
31313170
expansions:
31323171
NODE_LTS_VERSION: 24
31333172
CLIENT_ENCRYPTION: 'false'
31343173
TEST_CSFLE: 'false'
31353174
tasks:
3175+
- test-latest-server
3176+
- test-latest-replica_set
3177+
- test-latest-sharded_cluster
31363178
- test-rapid-server
31373179
- test-rapid-replica_set
31383180
- test-rapid-sharded_cluster
@@ -3154,6 +3196,12 @@ buildvariants:
31543196
- test-4.2-server
31553197
- test-4.2-replica_set
31563198
- test-4.2-sharded_cluster
3199+
- test-latest-server-v1-api
3200+
- test-socks5
3201+
- test-socks5-tls
3202+
- test-snappy-compression
3203+
- test-zstd-compression
3204+
- test-tls-support-latest
31573205
- test-tls-support-8.0
31583206
- test-tls-support-7.0
31593207
- test-tls-support-6.0

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,7 @@ const WINDOWS_SKIP_TAGS = new Set([
4545
'auth',
4646
'load_balancer',
4747
'socks5-csfle',
48-
'oidc',
49-
50-
// TODO: NODE-7356: enable skipped tests on windows
51-
'latest',
52-
'socks5',
53-
'socks5-tls',
54-
'tls-support-latest'
48+
'oidc'
5549
]);
5650

5751
const TASKS = [];

‎test/integration/client-side-operations-timeout/client_side_operations_timeout.spec.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ const skippedTests = {
1919
'TODO(DRIVERS-2965): see modified test in unified-csot-node-specs',
2020
'timeoutMS applies to full resume attempt in a next call': 'TODO(DRIVERS-3006)',
2121
'timeoutMS is refreshed for getMore if maxAwaitTimeMS is set': 'TODO(DRIVERS-3018)',
22-
'error on aggregate if maxAwaitTimeMS is greater than timeoutMS': 'TODO(NODE-7297)',
23-
'error on aggregate if maxAwaitTimeMS is equal to timeoutMS': 'TODO(NODE-7297)',
24-
'apply remaining timeoutMS if less than maxAwaitTimeMS': 'TODO(NODE-7297)'
22+
'error on aggregate if maxAwaitTimeMS is greater than timeoutMS': 'TODO(NODE-7360)',
23+
'error on aggregate if maxAwaitTimeMS is equal to timeoutMS': 'TODO(NODE-7360)',
24+
'apply remaining timeoutMS if less than maxAwaitTimeMS': 'TODO(NODE-7360)'
2525
};
2626

2727
describe('CSOT spec tests', function () {

‎test/integration/transactions-convenient-api/transactions-convenient-api.prose.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ describe('Retry Backoff is Enforced', function () {
7777
});
7878

7979
// 5. Compare the two time between the two runs.
80-
// The sum of 13 backoffs is roughly 2.2 seconds. There is a 1-second window to account for potential variance between the two runs.
80+
// The sum of 13 backoffs is roughly 1.8 seconds. There is a half-second window to account for potential variance between the two runs.
8181
expect(fullBackoffDuration).to.be.within(
82-
noBackoffTime + 2200 - 1000,
83-
noBackoffTime + 2200 + 1000
82+
noBackoffTime + 1800 - 500,
83+
noBackoffTime + 1800 + 500
8484
);
8585
}
8686
);

0 commit comments

Comments
 (0)