Skip to content

Commit fd3532f

Browse files
baileympearsondurran
baileympearson
authored and
durran
committed
test(NODE-4562): reduce macos coverage (#3381)
1 parent 20f9763 commit fd3532f

File tree

2 files changed

+111
-104
lines changed

2 files changed

+111
-104
lines changed

‎.evergreen/config.yml‎

Lines changed: 96 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -880,6 +880,45 @@ tasks:
880880
AUTH: auth
881881
- func: bootstrap kms servers
882882
- func: run tests
883+
- name: test-rapid-server
884+
tags:
885+
- rapid
886+
- server
887+
commands:
888+
- func: install dependencies
889+
- func: bootstrap mongo-orchestration
890+
vars:
891+
VERSION: rapid
892+
TOPOLOGY: server
893+
AUTH: auth
894+
- func: bootstrap kms servers
895+
- func: run tests
896+
- name: test-rapid-replica_set
897+
tags:
898+
- rapid
899+
- replica_set
900+
commands:
901+
- func: install dependencies
902+
- func: bootstrap mongo-orchestration
903+
vars:
904+
VERSION: rapid
905+
TOPOLOGY: replica_set
906+
AUTH: auth
907+
- func: bootstrap kms servers
908+
- func: run tests
909+
- name: test-rapid-sharded_cluster
910+
tags:
911+
- rapid
912+
- sharded_cluster
913+
commands:
914+
- func: install dependencies
915+
- func: bootstrap mongo-orchestration
916+
vars:
917+
VERSION: rapid
918+
TOPOLOGY: sharded_cluster
919+
AUTH: auth
920+
- func: bootstrap kms servers
921+
- func: run tests
883922
- name: test-6.0-server
884923
tags:
885924
- '6.0'
@@ -1825,6 +1864,48 @@ tasks:
18251864
AUTH: noauth
18261865
- func: bootstrap kms servers
18271866
- func: run tests
1867+
- name: test-rapid-server-noauth
1868+
tags:
1869+
- rapid
1870+
- server
1871+
- noauth
1872+
commands:
1873+
- func: install dependencies
1874+
- func: bootstrap mongo-orchestration
1875+
vars:
1876+
VERSION: rapid
1877+
TOPOLOGY: server
1878+
AUTH: noauth
1879+
- func: bootstrap kms servers
1880+
- func: run tests
1881+
- name: test-rapid-replica_set-noauth
1882+
tags:
1883+
- rapid
1884+
- replica_set
1885+
- noauth
1886+
commands:
1887+
- func: install dependencies
1888+
- func: bootstrap mongo-orchestration
1889+
vars:
1890+
VERSION: rapid
1891+
TOPOLOGY: replica_set
1892+
AUTH: noauth
1893+
- func: bootstrap kms servers
1894+
- func: run tests
1895+
- name: test-rapid-sharded_cluster-noauth
1896+
tags:
1897+
- rapid
1898+
- sharded_cluster
1899+
- noauth
1900+
commands:
1901+
- func: install dependencies
1902+
- func: bootstrap mongo-orchestration
1903+
vars:
1904+
VERSION: rapid
1905+
TOPOLOGY: sharded_cluster
1906+
AUTH: noauth
1907+
- func: bootstrap kms servers
1908+
- func: run tests
18281909
- name: test-6.0-server-noauth
18291910
tags:
18301911
- '6.0'
@@ -2125,102 +2206,13 @@ post:
21252206
ignore:
21262207
- '*.md'
21272208
buildvariants:
2128-
- name: macos-1014-erbium
2129-
display_name: macOS 10.14 Node Erbium
2130-
run_on: macos-1014
2131-
expansions:
2132-
NODE_LTS_NAME: erbium
2133-
CLIENT_ENCRYPTION: true
2134-
tasks: &ref_0
2135-
- test-latest-server
2136-
- test-latest-replica_set
2137-
- test-latest-sharded_cluster
2138-
- test-6.0-server
2139-
- test-6.0-replica_set
2140-
- test-6.0-sharded_cluster
2141-
- test-5.0-server
2142-
- test-5.0-replica_set
2143-
- test-5.0-sharded_cluster
2144-
- test-4.4-server
2145-
- test-4.4-replica_set
2146-
- test-4.4-sharded_cluster
2147-
- test-4.2-server
2148-
- test-4.2-replica_set
2149-
- test-4.2-sharded_cluster
2150-
- test-4.0-server
2151-
- test-4.0-replica_set
2152-
- test-4.0-sharded_cluster
2153-
- test-3.6-server
2154-
- test-3.6-replica_set
2155-
- test-3.6-sharded_cluster
2156-
- test-latest-server-v1-api
2157-
- test-atlas-connectivity
2158-
- test-atlas-data-lake
2159-
- test-auth-kerberos
2160-
- test-auth-ldap
2161-
- test-socks5
2162-
- test-socks5-tls
2163-
- test-zstd-compression
2164-
- test-snappy-compression
2165-
- test-tls-support-latest
2166-
- test-tls-support-6.0
2167-
- test-tls-support-5.0
2168-
- test-tls-support-4.4
2169-
- test-tls-support-4.2
2170-
- name: macos-1014-fermium
2171-
display_name: macOS 10.14 Node Fermium
2172-
run_on: macos-1014
2173-
expansions:
2174-
NODE_LTS_NAME: fermium
2175-
CLIENT_ENCRYPTION: true
2176-
tasks: *ref_0
2177-
- name: macos-1014-gallium
2178-
display_name: macOS 10.14 Node Gallium
2179-
run_on: macos-1014
2180-
expansions:
2181-
NODE_LTS_NAME: gallium
2182-
CLIENT_ENCRYPTION: true
2183-
tasks:
2184-
- test-latest-server
2185-
- test-latest-replica_set
2186-
- test-latest-sharded_cluster
2187-
- test-6.0-server
2188-
- test-6.0-replica_set
2189-
- test-6.0-sharded_cluster
2190-
- test-5.0-server
2191-
- test-5.0-replica_set
2192-
- test-5.0-sharded_cluster
2193-
- test-4.4-server
2194-
- test-4.4-replica_set
2195-
- test-4.4-sharded_cluster
2196-
- test-4.2-server
2197-
- test-4.2-replica_set
2198-
- test-4.2-sharded_cluster
2199-
- test-4.0-server
2200-
- test-4.0-replica_set
2201-
- test-4.0-sharded_cluster
2202-
- test-3.6-server
2203-
- test-3.6-replica_set
2204-
- test-3.6-sharded_cluster
2205-
- test-latest-server-v1-api
2206-
- test-atlas-connectivity
2207-
- test-atlas-data-lake
2208-
- test-auth-kerberos
2209-
- test-auth-ldap
2210-
- test-socks5
2211-
- test-socks5-tls
2212-
- test-tls-support-latest
2213-
- test-tls-support-6.0
2214-
- test-tls-support-5.0
2215-
- test-tls-support-4.4
2216-
- test-tls-support-4.2
22172209
- name: ubuntu-18.04-erbium
22182210
display_name: Ubuntu 18.04 Node Erbium
22192211
run_on: ubuntu1804-large
22202212
expansions:
22212213
NODE_LTS_NAME: erbium
22222214
CLIENT_ENCRYPTION: true
2223-
tasks: &ref_1
2215+
tasks: &ref_0
22242216
- test-latest-server
22252217
- test-latest-replica_set
22262218
- test-latest-sharded_cluster
@@ -2265,7 +2257,7 @@ buildvariants:
22652257
expansions:
22662258
NODE_LTS_NAME: fermium
22672259
CLIENT_ENCRYPTION: true
2268-
tasks: *ref_1
2260+
tasks: *ref_0
22692261
- name: ubuntu-18.04-gallium
22702262
display_name: Ubuntu 18.04 Node Gallium
22712263
run_on: ubuntu1804-large
@@ -2315,7 +2307,7 @@ buildvariants:
23152307
expansions:
23162308
NODE_LTS_NAME: erbium
23172309
MSVS_VERSION: 2019
2318-
tasks: &ref_2
2310+
tasks: &ref_1
23192311
- test-latest-server
23202312
- test-latest-replica_set
23212313
- test-latest-sharded_cluster
@@ -2354,7 +2346,7 @@ buildvariants:
23542346
expansions:
23552347
NODE_LTS_NAME: fermium
23562348
MSVS_VERSION: 2019
2357-
tasks: *ref_2
2349+
tasks: *ref_1
23582350
- name: windows-64-vs2019-gallium
23592351
display_name: Windows (VS2019) Node Gallium
23602352
run_on: windows-64-vs2019-large
@@ -2392,6 +2384,14 @@ buildvariants:
23922384
- test-tls-support-5.0
23932385
- test-tls-support-4.4
23942386
- test-tls-support-4.2
2387+
- name: macos-1100
2388+
display_name: MacOS 11 Node Gallium
2389+
run_on: macos-1100
2390+
expansions:
2391+
NODE_LTS_NAME: gallium
2392+
CLIENT_ENCRYPTION: true
2393+
tasks:
2394+
- test-rapid-server
23952395
- name: lint
23962396
display_name: lint
23972397
run_on: ubuntu1804-large
@@ -2465,6 +2465,9 @@ buildvariants:
24652465
- test-latest-server-noauth
24662466
- test-latest-replica_set-noauth
24672467
- test-latest-sharded_cluster-noauth
2468+
- test-rapid-server-noauth
2469+
- test-rapid-replica_set-noauth
2470+
- test-rapid-sharded_cluster-noauth
24682471
- test-6.0-server-noauth
24692472
- test-6.0-replica_set-noauth
24702473
- test-6.0-sharded_cluster-noauth

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ const fs = require('fs');
33
const yaml = require('js-yaml');
44

55
const LATEST_EFFECTIVE_VERSION = '6.0';
6-
const MONGODB_VERSIONS = ['latest', '6.0', '5.0', '4.4', '4.2', '4.0', '3.6'];
6+
const MONGODB_VERSIONS = ['latest', 'rapid', '6.0', '5.0', '4.4', '4.2', '4.0', '3.6'];
77
const NODE_VERSIONS = ['erbium', 'fermium', 'gallium'];
88
NODE_VERSIONS.sort();
99
const LOWEST_LTS = NODE_VERSIONS[0];
10+
const LATEST_LTS = NODE_VERSIONS[NODE_VERSIONS.length - 1];
1011

1112
const TOPOLOGIES = ['server', 'replica_set', 'sharded_cluster'];
1213
const AWS_AUTH_VERSIONS = ['latest', '6.0', '5.0', '4.4'];
@@ -15,11 +16,6 @@ const TLS_VERSIONS = ['latest', '6.0', '5.0', '4.4', '4.2'];
1516
const DEFAULT_OS = 'ubuntu1804-large';
1617

1718
const OPERATING_SYSTEMS = [
18-
{
19-
name: 'macos-1014',
20-
display_name: 'macOS 10.14',
21-
run_on: 'macos-1014'
22-
},
2319
{
2420
name: 'ubuntu-18.04',
2521
display_name: 'Ubuntu 18.04',
@@ -42,7 +38,6 @@ const OPERATING_SYSTEMS = [
4238

4339
// TODO: NODE-3060: enable skipped tests on windows
4440
const WINDOWS_SKIP_TAGS = new Set(['atlas-connect', 'auth', 'load_balancer']);
45-
const MACOS_SKIP_TAGS = new Set(['load_balancer']);
4641

4742
const TASKS = [];
4843
const SINGLETON_TASKS = [];
@@ -319,11 +314,9 @@ const getTaskList = (() => {
319314
.filter(task => {
320315
if (task.name.match(/^aws/)) return false;
321316

322-
// skip unsupported tasks on windows or macos
323317
if (
324318
task.tags &&
325-
((os.match(/^windows/) && task.tags.filter(tag => WINDOWS_SKIP_TAGS.has(tag)).length) ||
326-
(os.match(/^macos/) && task.tags.filter(tag => MACOS_SKIP_TAGS.has(tag)).length))
319+
(os.match(/^windows/) && task.tags.filter(tag => WINDOWS_SKIP_TAGS.has(tag)).length)
327320
) {
328321
return false;
329322
}
@@ -361,7 +354,7 @@ OPERATING_SYSTEMS.forEach(
361354
const tasks = getTaskList(mongoVersion, osName.split('-')[0]);
362355

363356
testedNodeVersions.forEach(NODE_LTS_NAME => {
364-
const nodeLtsDisplayName = `Node ${NODE_LTS_NAME[0].toUpperCase()}${NODE_LTS_NAME.substr(1)}`;
357+
const nodeLtsDisplayName = `Node ${NODE_LTS_NAME[0].toUpperCase()}${NODE_LTS_NAME.slice(1)}`;
365358
const name = `${osName}-${NODE_LTS_NAME}`;
366359
const display_name = `${osDisplayName} ${nodeLtsDisplayName}`;
367360
const expansions = { NODE_LTS_NAME };
@@ -378,6 +371,17 @@ OPERATING_SYSTEMS.forEach(
378371
}
379372
);
380373

374+
BUILD_VARIANTS.push({
375+
name: 'macos-1100',
376+
display_name: `MacOS 11 Node ${LATEST_LTS[0].toUpperCase()}${LATEST_LTS.slice(1)}`,
377+
run_on: 'macos-1100',
378+
expansions: {
379+
NODE_LTS_NAME: LATEST_LTS,
380+
CLIENT_ENCRYPTION: true
381+
},
382+
tasks: ['test-rapid-server']
383+
});
384+
381385
// singleton build variant for linting
382386
SINGLETON_TASKS.push(
383387
...[

0 commit comments

Comments
 (0)