From f93ab6d41c436f0298122e0c4045f76ae6c65b5a Mon Sep 17 00:00:00 2001 From: Neal Beeken Date: Mon, 22 Aug 2022 17:28:51 -0400 Subject: [PATCH 1/2] test(NODE-4574): skip zstd and snappy on gallium --- .evergreen/config.yml | 105 ++++++++++++++++++++++++- .evergreen/generate_evergreen_tasks.js | 24 +++++- 2 files changed, 122 insertions(+), 7 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index cb85907cd4c..976fc2e5985 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -2180,7 +2180,40 @@ buildvariants: expansions: NODE_LTS_NAME: gallium CLIENT_ENCRYPTION: true - tasks: *ref_0 + tasks: + - test-latest-server + - test-latest-replica_set + - test-latest-sharded_cluster + - test-6.0-server + - test-6.0-replica_set + - test-6.0-sharded_cluster + - test-5.0-server + - test-5.0-replica_set + - test-5.0-sharded_cluster + - test-4.4-server + - test-4.4-replica_set + - test-4.4-sharded_cluster + - test-4.2-server + - test-4.2-replica_set + - test-4.2-sharded_cluster + - test-4.0-server + - test-4.0-replica_set + - test-4.0-sharded_cluster + - test-3.6-server + - test-3.6-replica_set + - test-3.6-sharded_cluster + - test-latest-server-v1-api + - test-atlas-connectivity + - test-atlas-data-lake + - test-auth-kerberos + - test-auth-ldap + - test-socks5 + - test-socks5-tls + - test-tls-support-latest + - test-tls-support-6.0 + - test-tls-support-5.0 + - test-tls-support-4.4 + - test-tls-support-4.2 - name: ubuntu-18.04-erbium display_name: Ubuntu 18.04 Node Erbium run_on: ubuntu1804-large @@ -2239,7 +2272,43 @@ buildvariants: expansions: NODE_LTS_NAME: gallium CLIENT_ENCRYPTION: true - tasks: *ref_1 + tasks: + - test-latest-server + - test-latest-replica_set + - test-latest-sharded_cluster + - test-6.0-server + - test-6.0-replica_set + - test-6.0-sharded_cluster + - test-5.0-server + - test-5.0-replica_set + - test-5.0-sharded_cluster + - test-4.4-server + - test-4.4-replica_set + - test-4.4-sharded_cluster + - test-4.2-server + - test-4.2-replica_set + - test-4.2-sharded_cluster + - test-4.0-server + - test-4.0-replica_set + - test-4.0-sharded_cluster + - test-3.6-server + - test-3.6-replica_set + - test-3.6-sharded_cluster + - test-latest-server-v1-api + - test-atlas-connectivity + - test-atlas-data-lake + - test-5.0-load-balanced + - test-6.0-load-balanced + - test-latest-load-balanced + - test-auth-kerberos + - test-auth-ldap + - test-socks5 + - test-socks5-tls + - test-tls-support-latest + - test-tls-support-6.0 + - test-tls-support-5.0 + - test-tls-support-4.4 + - test-tls-support-4.2 - name: windows-64-vs2019-erbium display_name: Windows (VS2019) Node Erbium run_on: windows-64-vs2019-large @@ -2292,7 +2361,37 @@ buildvariants: expansions: NODE_LTS_NAME: gallium MSVS_VERSION: 2019 - tasks: *ref_2 + tasks: + - test-latest-server + - test-latest-replica_set + - test-latest-sharded_cluster + - test-6.0-server + - test-6.0-replica_set + - test-6.0-sharded_cluster + - test-5.0-server + - test-5.0-replica_set + - test-5.0-sharded_cluster + - test-4.4-server + - test-4.4-replica_set + - test-4.4-sharded_cluster + - test-4.2-server + - test-4.2-replica_set + - test-4.2-sharded_cluster + - test-4.0-server + - test-4.0-replica_set + - test-4.0-sharded_cluster + - test-3.6-server + - test-3.6-replica_set + - test-3.6-sharded_cluster + - test-latest-server-v1-api + - test-atlas-data-lake + - test-socks5 + - test-socks5-tls + - test-tls-support-latest + - test-tls-support-6.0 + - test-tls-support-5.0 + - test-tls-support-4.4 + - test-tls-support-4.2 - name: lint display_name: lint run_on: ubuntu1804-large diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index 7e54eb2494a..ba1ec25ae83 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -227,7 +227,7 @@ TASKS.push( ] ); -['zstd', 'snappy'].forEach(compressor => { +for (const compressor of ['zstd', 'snappy']) { TASKS.push({ name: `test-${compressor}-compression`, tags: ['latest', compressor], @@ -245,7 +245,7 @@ TASKS.push( { func: 'run-compression-tests' } ] }); -}); +} TLS_VERSIONS.forEach(VERSION => { TASKS.push({ @@ -549,8 +549,8 @@ const oneOffFuncAsTasks = oneOffFuncs.map(oneOffFunc => ({ ] })); -[ '5.0', 'rapid', 'latest' ].forEach(version => { - [ 'c071d5a8d59ddcad40f22887a12bdb374c2f86af', 'master' ].forEach(ref => { +['5.0', 'rapid', 'latest'].forEach(version => { + ['c071d5a8d59ddcad40f22887a12bdb374c2f86af', 'master'].forEach(ref => { oneOffFuncAsTasks.push({ name: `run-custom-csfle-tests-${version}-${ref === 'master' ? ref : 'pinned-commit'}`, tags: ['run-custom-dependency-tests'], @@ -622,6 +622,22 @@ BUILD_VARIANTS.push({ tasks: AUTH_DISABLED_TASKS.map(({ name }) => name) }); +// TODO(NODE-4575): unskip zstd and snappy on node 16 +for (const variant of BUILD_VARIANTS.filter(variant => { + if (variant.expansions) return variant.expansions.NODE_LTS_NAME === 'gallium'; + return false; +})) { + const zstdIndex = variant.tasks.findIndex(taskName => taskName === 'test-zstd-compression'); + if (zstdIndex !== -1) { + variant.tasks = [...variant.tasks.slice(0, zstdIndex), ...variant.tasks.slice(zstdIndex + 1)]; + } + + const snappyIndex = variant.tasks.findIndex(taskName => taskName === 'test-snappy-compression'); + if (snappyIndex !== -1) { + variant.tasks = [...variant.tasks.slice(0, snappyIndex), ...variant.tasks.slice(snappyIndex + 1)] + } +} + const fileData = yaml.load(fs.readFileSync(`${__dirname}/config.in.yml`, 'utf8')); fileData.tasks = (fileData.tasks || []) .concat(BASE_TASKS) From e4814d65395a501322bae523a92d43c6d1ba4e60 Mon Sep 17 00:00:00 2001 From: Neal Beeken Date: Tue, 23 Aug 2022 14:12:45 -0400 Subject: [PATCH 2/2] fix: cleanup filter logic --- .evergreen/generate_evergreen_tasks.js | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js index ba1ec25ae83..c6169cda52b 100644 --- a/.evergreen/generate_evergreen_tasks.js +++ b/.evergreen/generate_evergreen_tasks.js @@ -623,19 +623,12 @@ BUILD_VARIANTS.push({ }); // TODO(NODE-4575): unskip zstd and snappy on node 16 -for (const variant of BUILD_VARIANTS.filter(variant => { - if (variant.expansions) return variant.expansions.NODE_LTS_NAME === 'gallium'; - return false; -})) { - const zstdIndex = variant.tasks.findIndex(taskName => taskName === 'test-zstd-compression'); - if (zstdIndex !== -1) { - variant.tasks = [...variant.tasks.slice(0, zstdIndex), ...variant.tasks.slice(zstdIndex + 1)]; - } - - const snappyIndex = variant.tasks.findIndex(taskName => taskName === 'test-snappy-compression'); - if (snappyIndex !== -1) { - variant.tasks = [...variant.tasks.slice(0, snappyIndex), ...variant.tasks.slice(snappyIndex + 1)] - } +for (const variant of BUILD_VARIANTS.filter( + variant => variant.expansions && variant.expansions.NODE_LTS_NAME === 'gallium' +)) { + variant.tasks = variant.tasks.filter( + name => !['test-zstd-compression', 'test-snappy-compression'].includes(name) + ); } const fileData = yaml.load(fs.readFileSync(`${__dirname}/config.in.yml`, 'utf8'));