Skip to content

Commit 484adb9

Browse files
authored
test(NODE-6944): unskip ldap and kerberos tests (#4591)
1 parent 93fe5ba commit 484adb9

File tree

3 files changed

+68
-17
lines changed

3 files changed

+68
-17
lines changed

.evergreen/config.in.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,10 @@ functions:
375375
params:
376376
binary: bash
377377
working_dir: src
378+
include_expansions_in_env:
379+
- AWS_SECRET_ACCESS_KEY
380+
- AWS_ACCESS_KEY_ID
381+
- AWS_SESSION_TOKEN
378382
env:
379383
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
380384
args:
@@ -387,6 +391,10 @@ functions:
387391
params:
388392
working_dir: src
389393
binary: bash
394+
include_expansions_in_env:
395+
- AWS_SECRET_ACCESS_KEY
396+
- AWS_ACCESS_KEY_ID
397+
- AWS_SESSION_TOKEN
390398
env:
391399
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
392400
NODE_LTS_VERSION: ${NODE_LTS_VERSION}

.evergreen/config.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,10 @@ functions:
331331
params:
332332
binary: bash
333333
working_dir: src
334+
include_expansions_in_env:
335+
- AWS_SECRET_ACCESS_KEY
336+
- AWS_ACCESS_KEY_ID
337+
- AWS_SESSION_TOKEN
334338
env:
335339
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
336340
args:
@@ -344,6 +348,10 @@ functions:
344348
params:
345349
working_dir: src
346350
binary: bash
351+
include_expansions_in_env:
352+
- AWS_SECRET_ACCESS_KEY
353+
- AWS_ACCESS_KEY_ID
354+
- AWS_SESSION_TOKEN
347355
env:
348356
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
349357
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
@@ -1681,6 +1689,27 @@ tasks:
16811689
- func: start-load-balancer
16821690
- func: run-lb-tests
16831691
- func: stop-load-balancer
1692+
- name: test-auth-kerberos
1693+
tags:
1694+
- auth
1695+
- kerberos
1696+
commands:
1697+
- command: expansions.update
1698+
type: setup
1699+
params:
1700+
updates:
1701+
- {key: NATIVE, value: 'true'}
1702+
- func: install dependencies
1703+
- func: assume secrets manager role
1704+
- func: run kerberos tests
1705+
- name: test-auth-ldap
1706+
tags:
1707+
- auth
1708+
- ldap
1709+
commands:
1710+
- func: install dependencies
1711+
- func: assume secrets manager role
1712+
- func: run ldap tests
16841713
- name: test-socks5
16851714
tags: []
16861715
commands:
@@ -3058,6 +3087,8 @@ buildvariants:
30583087
- test-8.0-load-balanced
30593088
- test-rapid-load-balanced
30603089
- test-latest-load-balanced
3090+
- test-auth-kerberos
3091+
- test-auth-ldap
30613092
- test-socks5
30623093
- test-socks5-csfle
30633094
- test-socks5-tls
@@ -3113,6 +3144,8 @@ buildvariants:
31133144
- test-8.0-load-balanced
31143145
- test-rapid-load-balanced
31153146
- test-latest-load-balanced
3147+
- test-auth-kerberos
3148+
- test-auth-ldap
31163149
- test-socks5
31173150
- test-socks5-csfle
31183151
- test-socks5-tls
@@ -3168,6 +3201,8 @@ buildvariants:
31683201
- test-8.0-load-balanced
31693202
- test-rapid-load-balanced
31703203
- test-latest-load-balanced
3204+
- test-auth-kerberos
3205+
- test-auth-ldap
31713206
- test-socks5
31723207
- test-socks5-csfle
31733208
- test-socks5-tls
@@ -3223,6 +3258,8 @@ buildvariants:
32233258
- test-8.0-load-balanced
32243259
- test-rapid-load-balanced
32253260
- test-latest-load-balanced
3261+
- test-auth-kerberos
3262+
- test-auth-ldap
32263263
- test-socks5
32273264
- test-socks5-csfle
32283265
- test-socks5-tls
@@ -3276,6 +3313,8 @@ buildvariants:
32763313
- test-8.0-load-balanced
32773314
- test-rapid-load-balanced
32783315
- test-latest-load-balanced
3316+
- test-auth-kerberos
3317+
- test-auth-ldap
32793318
- test-socks5-csfle
32803319
- test-socks5-tls
32813320
- test-snappy-compression

.evergreen/generate_evergreen_tasks.js

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -151,23 +151,27 @@ TASKS.push(
151151
{ func: 'stop-load-balancer' }
152152
]
153153
})),
154-
// TODO(NODE-6944): Unskip when devprod updates ldaptest servers.
155-
// {
156-
// name: 'test-auth-kerberos',
157-
// tags: ['auth', 'kerberos'],
158-
// commands: [
159-
// updateExpansions({
160-
// NATIVE: 'true'
161-
// }),
162-
// { func: 'install dependencies' },
163-
// { func: 'run kerberos tests' }
164-
// ]
165-
// },
166-
// {
167-
// name: 'test-auth-ldap',
168-
// tags: ['auth', 'ldap'],
169-
// commands: [{ func: 'install dependencies' }, { func: 'run ldap tests' }]
170-
// },
154+
{
155+
name: 'test-auth-kerberos',
156+
tags: ['auth', 'kerberos'],
157+
commands: [
158+
updateExpansions({
159+
NATIVE: 'true'
160+
}),
161+
{ func: 'install dependencies' },
162+
{ func: 'assume secrets manager role' },
163+
{ func: 'run kerberos tests' }
164+
]
165+
},
166+
{
167+
name: 'test-auth-ldap',
168+
tags: ['auth', 'ldap'],
169+
commands: [
170+
{ func: 'install dependencies' },
171+
{ func: 'assume secrets manager role' },
172+
{ func: 'run ldap tests' }
173+
]
174+
},
171175
{
172176
name: 'test-socks5',
173177
tags: [],

0 commit comments

Comments
 (0)