From 6a52bed4c8600d12af2c1f56c1433ec8f32c48cf Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Tue, 22 Jul 2025 20:44:05 +0200 Subject: [PATCH 1/3] test(NODE-6944): unskip ldap and kerberos tests --- .evergreen/config.yml | 29 ++++++++++++++++++++++ .evergreen/generate_evergreen_tasks.js | 33 +++++++++++++------------- 2 files changed, 45 insertions(+), 17 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index c0e1e0b2d29..73bedf18c8c 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1681,6 +1681,25 @@ tasks: - func: start-load-balancer - func: run-lb-tests - func: stop-load-balancer + - name: test-auth-kerberos + tags: + - auth + - kerberos + commands: + - command: expansions.update + type: setup + params: + updates: + - {key: NATIVE, value: 'true'} + - func: install dependencies + - func: run kerberos tests + - name: test-auth-ldap + tags: + - auth + - ldap + commands: + - func: install dependencies + - func: run ldap tests - name: test-socks5 tags: [] commands: @@ -3058,6 +3077,8 @@ buildvariants: - test-8.0-load-balanced - test-rapid-load-balanced - test-latest-load-balanced + - test-auth-kerberos + - test-auth-ldap - test-socks5 - test-socks5-csfle - test-socks5-tls @@ -3113,6 +3134,8 @@ buildvariants: - test-8.0-load-balanced - test-rapid-load-balanced - test-latest-load-balanced + - test-auth-kerberos + - test-auth-ldap - test-socks5 - test-socks5-csfle - test-socks5-tls @@ -3168,6 +3191,8 @@ buildvariants: - test-8.0-load-balanced - test-rapid-load-balanced - test-latest-load-balanced + - test-auth-kerberos + - test-auth-ldap - test-socks5 - test-socks5-csfle - test-socks5-tls @@ -3223,6 +3248,8 @@ buildvariants: - test-8.0-load-balanced - test-rapid-load-balanced - test-latest-load-balanced + - test-auth-kerberos + - test-auth-ldap - test-socks5 - test-socks5-csfle - test-socks5-tls @@ -3276,6 +3303,8 @@ buildvariants: - test-8.0-load-balanced - test-rapid-load-balanced - test-latest-load-balanced + - test-auth-kerberos + - test-auth-ldap - test-socks5-csfle - test-socks5-tls - test-snappy-compression diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index 51d895d054a..e33c1b44721 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -151,23 +151,22 @@ TASKS.push( { func: 'stop-load-balancer' } ] })), - // TODO(NODE-6944): Unskip when devprod updates ldaptest servers. - // { - // name: 'test-auth-kerberos', - // tags: ['auth', 'kerberos'], - // commands: [ - // updateExpansions({ - // NATIVE: 'true' - // }), - // { func: 'install dependencies' }, - // { func: 'run kerberos tests' } - // ] - // }, - // { - // name: 'test-auth-ldap', - // tags: ['auth', 'ldap'], - // commands: [{ func: 'install dependencies' }, { func: 'run ldap tests' }] - // }, + { + name: 'test-auth-kerberos', + tags: ['auth', 'kerberos'], + commands: [ + updateExpansions({ + NATIVE: 'true' + }), + { func: 'install dependencies' }, + { func: 'run kerberos tests' } + ] + }, + { + name: 'test-auth-ldap', + tags: ['auth', 'ldap'], + commands: [{ func: 'install dependencies' }, { func: 'run ldap tests' }] + }, { name: 'test-socks5', tags: [], From 32815af8835f2546903f67471ff06e70f054aa6c Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Tue, 22 Jul 2025 21:19:02 +0200 Subject: [PATCH 2/3] test: assume secrets manager role --- .evergreen/config.yml | 2 ++ .evergreen/generate_evergreen_tasks.js | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 73bedf18c8c..8b8596f146f 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1692,6 +1692,7 @@ tasks: updates: - {key: NATIVE, value: 'true'} - func: install dependencies + - func: assume secrets manager role - func: run kerberos tests - name: test-auth-ldap tags: @@ -1699,6 +1700,7 @@ tasks: - ldap commands: - func: install dependencies + - func: assume secrets manager role - func: run ldap tests - name: test-socks5 tags: [] diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index e33c1b44721..c5e902f7b8e 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -159,13 +159,18 @@ TASKS.push( NATIVE: 'true' }), { func: 'install dependencies' }, + { func: 'assume secrets manager role' }, { func: 'run kerberos tests' } ] }, { name: 'test-auth-ldap', tags: ['auth', 'ldap'], - commands: [{ func: 'install dependencies' }, { func: 'run ldap tests' }] + commands: [ + { func: 'install dependencies' }, + { func: 'assume secrets manager role' }, + { func: 'run ldap tests' } + ] }, { name: 'test-socks5', From 4465426b1da05558965231fb5bfd14feaac5b82c Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Tue, 22 Jul 2025 21:55:36 +0200 Subject: [PATCH 3/3] test: include expansions --- .evergreen/config.in.yml | 8 ++++++++ .evergreen/config.yml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index 00f401c4f03..e02f1bbf40f 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -375,6 +375,10 @@ functions: params: binary: bash working_dir: src + include_expansions_in_env: + - AWS_SECRET_ACCESS_KEY + - AWS_ACCESS_KEY_ID + - AWS_SESSION_TOKEN env: DRIVERS_TOOLS: ${DRIVERS_TOOLS} args: @@ -387,6 +391,10 @@ functions: params: working_dir: src binary: bash + include_expansions_in_env: + - AWS_SECRET_ACCESS_KEY + - AWS_ACCESS_KEY_ID + - AWS_SESSION_TOKEN env: DRIVERS_TOOLS: ${DRIVERS_TOOLS} NODE_LTS_VERSION: ${NODE_LTS_VERSION} diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 8b8596f146f..ef74d7d5c7e 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -331,6 +331,10 @@ functions: params: binary: bash working_dir: src + include_expansions_in_env: + - AWS_SECRET_ACCESS_KEY + - AWS_ACCESS_KEY_ID + - AWS_SESSION_TOKEN env: DRIVERS_TOOLS: ${DRIVERS_TOOLS} args: @@ -344,6 +348,10 @@ functions: params: working_dir: src binary: bash + include_expansions_in_env: + - AWS_SECRET_ACCESS_KEY + - AWS_ACCESS_KEY_ID + - AWS_SESSION_TOKEN env: DRIVERS_TOOLS: ${DRIVERS_TOOLS} NODE_LTS_VERSION: ${NODE_LTS_VERSION}