Skip to content

Commit 6a6dde1

Browse files
authored
test(NODE-4894): re-enable kerberos tests on 18 (#3527)
1 parent b98e928 commit 6a6dde1

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

.evergreen/config.in.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,7 @@ functions:
452452
script: |
453453
export PROJECT_DIRECTORY="$(pwd)"
454454
export KRB5_KEYTAB='${gssapi_auth_keytab_base64}'
455+
export KRB5_NEW_KEYTAB='${gssapi_auth_new_keytab_base64}'
455456
export KRB5_PRINCIPAL='${gssapi_auth_principal}'
456457
export MONGODB_URI='${gssapi_auth_mongodb_uri}'
457458
export NODE_LTS_NAME='${NODE_LTS_NAME}'

.evergreen/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ functions:
421421
script: |
422422
export PROJECT_DIRECTORY="$(pwd)"
423423
export KRB5_KEYTAB='${gssapi_auth_keytab_base64}'
424+
export KRB5_NEW_KEYTAB='${gssapi_auth_new_keytab_base64}'
424425
export KRB5_PRINCIPAL='${gssapi_auth_principal}'
425426
export MONGODB_URI='${gssapi_auth_mongodb_uri}'
426427
export NODE_LTS_NAME='${NODE_LTS_NAME}'
@@ -2769,6 +2770,7 @@ buildvariants:
27692770
- test-5.0-load-balanced
27702771
- test-6.0-load-balanced
27712772
- test-latest-load-balanced
2773+
- test-auth-kerberos
27722774
- test-auth-ldap
27732775
- test-socks5
27742776
- test-socks5-csfle

.evergreen/generate_evergreen_tasks.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,9 +688,9 @@ for (const variant of BUILD_VARIANTS.filter(
688688
);
689689
}
690690

691-
// TODO(NODE-4894): fix kerberos tests on Node18
691+
// TODO(NODE-5021): Drop support for Kerberos 1.x on in 6.0.0
692692
for (const variant of BUILD_VARIANTS.filter(
693-
variant => variant.expansions && ['hydrogen', 'latest'].includes(variant.expansions.NODE_LTS_NAME)
693+
variant => variant.expansions && ['latest'].includes(variant.expansions.NODE_LTS_NAME)
694694
)) {
695695
variant.tasks = variant.tasks.filter(
696696
name => !['test-auth-kerberos'].includes(name)

.evergreen/run-kerberos-tests.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@ source "${PROJECT_DIRECTORY}/.evergreen/init-nvm.sh"
66

77
# set up keytab
88
mkdir -p "$(pwd)/.evergreen"
9-
touch "$(pwd)/.evergreen/krb5.conf.empty"
109
export KRB5_CONFIG="$(pwd)/.evergreen/krb5.conf.empty"
1110
echo "Writing keytab"
1211
# DON'T PRINT KEYTAB TO STDOUT
1312
set +o verbose
1413
if [[ "$OSTYPE" == "darwin"* ]]; then
15-
echo ${KRB5_KEYTAB} | base64 -D > "$(pwd)/.evergreen/drivers.keytab"
14+
echo ${KRB5_NEW_KEYTAB} | base64 -D > "$(pwd)/.evergreen/drivers.keytab"
1615
else
17-
echo ${KRB5_KEYTAB} | base64 -d > "$(pwd)/.evergreen/drivers.keytab"
16+
echo ${KRB5_NEW_KEYTAB} | base64 -d > "$(pwd)/.evergreen/drivers.keytab"
1817
fi
18+
echo "Running kdestroy"
19+
kdestroy -A
1920
echo "Running kinit"
2021
kinit -k -t "$(pwd)/.evergreen/drivers.keytab" -p ${KRB5_PRINCIPAL}
2122

0 commit comments

Comments
 (0)