@@ -3,62 +3,40 @@ const fs = require('fs');
33const yaml = require ( 'js-yaml' ) ;
44
55const LATEST_EFFECTIVE_VERSION = '5.0' ;
6- const MONGODB_VERSIONS = [ 'latest' , '4.4' , '4.2' , '4.0' , '3.6' , '3.4' , '3.2' , '3.0' , '2.6' ] ;
7- const NODE_VERSIONS = [ 'dubnium' , 'erbium' , 'fermium' ] ;
6+ const MONGODB_VERSIONS = [ 'latest' , '5.0' , '4.4' , '4.2' , '4.0' , '3.6' , '3.4' , '3.2' , '3.0' , '2.6' ] ;
7+ const LOWEST_LTS = 'erbium' ;
8+ const NODE_VERSIONS = [ LOWEST_LTS , 'fermium' ] ;
89const TOPOLOGIES = [ 'server' , 'replica_set' , 'sharded_cluster' ] ;
9- const AWS_AUTH_VERSIONS = [ 'latest' , '4.4' ] ;
10- const OCSP_VERSIONS = [ 'latest' , '4.4' ] ;
11- const TLS_VERSIONS = [ 'latest' , '4.2' ] ; // also test on 4.2 because 4.4+ currently skipped on windows
10+ const AWS_AUTH_VERSIONS = [ 'latest' , '5.0' , '4.4' ] ;
11+ const OCSP_VERSIONS = [ 'latest' , '5.0' , '4.4' ] ;
12+ const TLS_VERSIONS = [ 'latest' , '5.0' , '4.4' , '4.2' ] ;
13+
14+ const DEFAULT_OS = 'ubuntu1804-large'
1215
1316const OPERATING_SYSTEMS = [
1417 {
1518 name : 'macos-1014' ,
1619 display_name : 'macOS 10.14' ,
17- run_on : 'macos-1014' ,
18- auth : false
19- } ,
20- {
21- name : 'rhel70' ,
22- display_name : 'RHEL 7.0' ,
23- run_on : 'rhel70-small'
24- } ,
25- {
26- name : 'ubuntu-14.04' ,
27- display_name : 'Ubuntu 14.04' ,
28- run_on : 'ubuntu1404-large' ,
29- mongoVersion : '<4.2'
20+ run_on : 'macos-1014'
3021 } ,
3122 {
3223 name : 'ubuntu-18.04' ,
3324 display_name : 'Ubuntu 18.04' ,
34- run_on : 'ubuntu1804-large' ,
35- mongoVersion : '>=3.2' ,
36- clientEncryption : true
37- } ,
38- {
39- name : 'windows-64-vs2015' ,
40- display_name : 'Windows (VS2015)' ,
41- run_on : 'windows-64-vs2015-large' ,
42- msvsVersion : 2015 ,
43- mongoVersion : '<4.4'
25+ run_on : 'ubuntu1804-large'
4426 } ,
4527 {
46- name : 'windows-64-vs2017' ,
47- display_name : 'Windows (VS2017)' ,
48- run_on : 'windows-64-vs2017-large' ,
49- msvsVersion : 2017 ,
50- mongoVersion : '<4.4'
28+ name : 'windows-64-vs2019' ,
29+ display_name : 'Windows (VS2019)' ,
30+ run_on : 'windows-64-vs2019-large' ,
31+ msvsVersion : 2019
5132 }
52- ] . map ( osConfig =>
53- Object . assign (
54- {
55- mongoVersion : '>=2.6' ,
56- nodeVersion : 'dubnium' ,
57- auth : false
58- } ,
59- osConfig
60- )
61- ) ;
33+ ] . map ( osConfig => ( {
34+ mongoVersion : '>=2.6' ,
35+ nodeVersion : LOWEST_LTS ,
36+ auth : false , // TODO test auth?
37+ clientEncryption : false , // TODO(NODE-3372): Reenable with the next FLE release
38+ ...osConfig
39+ } ) ) ;
6240
6341// TODO: NODE-3060: enable skipped tests on windows
6442const WINDOWS_SKIP_TAGS = new Set ( [ 'atlas-connect' , 'auth' ] ) ;
@@ -112,7 +90,7 @@ BASE_TASKS.push({
11290} ) ;
11391
11492// manually added tasks
115- Array . prototype . push . apply ( TASKS , [
93+ TASKS . push ( ... [
11694 {
11795 name : 'test-atlas-connectivity' ,
11896 tags : [ 'atlas-connect' ] ,
@@ -276,7 +254,7 @@ TLS_VERSIONS.forEach(VERSION => {
276254
277255OCSP_VERSIONS . forEach ( VERSION => {
278256 // manually added tasks
279- Array . prototype . push . apply ( TASKS , [
257+ TASKS . push ( ... [
280258 {
281259 name : `test-${ VERSION } -ocsp-valid-cert-server-staples` ,
282260 tags : [ 'ocsp' ] ,
@@ -400,7 +378,7 @@ OCSP_VERSIONS.forEach(VERSION => {
400378const AWS_AUTH_TASKS = [ ] ;
401379
402380AWS_AUTH_VERSIONS . forEach ( VERSION => {
403- const name = ( ex ) => `aws-${ VERSION } -auth-test-${ ex . split ( ' ' ) . join ( '-' ) } ` ;
381+ const name = ex => `aws-${ VERSION } -auth-test-${ ex . split ( ' ' ) . join ( '-' ) } ` ;
404382 const aws_funcs = [
405383 { func : 'run aws auth test with regular aws credentials' } ,
406384 { func : 'run aws auth test with assume role credentials' } ,
@@ -427,13 +405,12 @@ AWS_AUTH_VERSIONS.forEach(VERSION => {
427405 { func : 'setup aws env' } ,
428406 fn
429407 ]
430- } ) )
408+ } ) ) ;
431409
432410 TASKS . push ( ...aws_tasks ) ;
433- AWS_AUTH_TASKS . push ( ...aws_tasks . map ( t => t . name ) )
411+ AWS_AUTH_TASKS . push ( ...aws_tasks . map ( t => t . name ) ) ;
434412} ) ;
435413
436-
437414const BUILD_VARIANTS = [ ] ;
438415
439416const getTaskList = ( ( ) => {
@@ -516,29 +493,33 @@ SINGLETON_TASKS.push({
516493 {
517494 func : 'install dependencies' ,
518495 vars : {
519- NODE_LTS_NAME : 'erbium'
496+ NODE_LTS_NAME : LOWEST_LTS
520497 }
521498 } ,
522499 { func : 'run checks' }
523500 ]
524501} ) ;
525502
526- BUILD_VARIANTS . push ( {
527- name : 'lint' ,
528- display_name : 'lint' ,
529- run_on : 'rhel70' ,
530- tasks : [ 'run-checks' ]
531- } , {
532- name : 'ubuntu1804-custom-csfle-tests' ,
533- display_name : 'Custom FLE Version Test' ,
534- run_on : 'ubuntu1804-test' ,
535- tasks : [ 'run-custom-csfle-tests' ]
536- } , {
537- name : 'ubuntu1804-run-bson-ext-test' ,
538- display_name : 'BSON EXT Test' ,
539- run_on : 'ubuntu1804-test' ,
540- tasks : [ 'run-bson-ext-test' ]
541- } ) ;
503+ BUILD_VARIANTS . push (
504+ {
505+ name : 'lint' ,
506+ display_name : 'lint' ,
507+ run_on : DEFAULT_OS ,
508+ tasks : [ 'run-checks' ]
509+ } ,
510+ {
511+ name : 'ubuntu1804-custom-csfle-tests' ,
512+ display_name : 'Custom FLE Version Test' ,
513+ run_on : DEFAULT_OS ,
514+ tasks : [ 'run-custom-csfle-tests' ]
515+ } ,
516+ {
517+ name : 'ubuntu1804-run-bson-ext-test' ,
518+ display_name : 'BSON EXT Test' ,
519+ run_on : DEFAULT_OS ,
520+ tasks : [ 'run-bson-ext-test' ]
521+ }
522+ ) ;
542523
543524// singleton build variant for mongosh integration tests
544525SINGLETON_TASKS . push ( {
@@ -569,7 +550,7 @@ BUILD_VARIANTS.push({
569550 display_name : 'MONGODB-AWS Auth test' ,
570551 run_on : 'ubuntu1804-test' ,
571552 expansions : {
572- NODE_LTS_NAME : 'dubnium'
553+ NODE_LTS_NAME : LOWEST_LTS
573554 } ,
574555 tasks : AWS_AUTH_TASKS
575556} ) ;
@@ -582,8 +563,8 @@ SINGLETON_TASKS.push({
582563 {
583564 func : 'install dependencies' ,
584565 vars : {
585- NODE_LTS_NAME : 'erbium' ,
586- } ,
566+ NODE_LTS_NAME : LOWEST_LTS
567+ }
587568 } ,
588569 {
589570 func : 'bootstrap mongo-orchestration' ,
@@ -604,8 +585,8 @@ SINGLETON_TASKS.push({
604585 {
605586 func : 'install dependencies' ,
606587 vars : {
607- NODE_LTS_NAME : 'fermium' ,
608- } ,
588+ NODE_LTS_NAME : LOWEST_LTS
589+ }
609590 } ,
610591 {
611592 func : 'bootstrap mongo-orchestration' ,
@@ -614,9 +595,10 @@ SINGLETON_TASKS.push({
614595 TOPOLOGY : 'server'
615596 }
616597 } ,
617- { func : 'run bson-ext test' ,
598+ {
599+ func : 'run bson-ext test' ,
618600 vars : {
619- NODE_LTS_NAME : 'fermium' ,
601+ NODE_LTS_NAME : LOWEST_LTS
620602 }
621603 }
622604 ]
0 commit comments