@@ -12,19 +12,23 @@ const {
1212 TOPOLOGIES ,
1313 AWS_AUTH_VERSIONS ,
1414 TLS_VERSIONS ,
15- DEFAULT_OS
15+ DEFAULT_OS ,
16+ WINDOWS_OS ,
17+ MACOS_OS ,
18+ UBUNTU_OS ,
19+ DEBIAN_OS
1620} = require ( './ci_matrix_constants' ) ;
1721
1822const OPERATING_SYSTEMS = [
1923 {
20- name : 'rhel80-large' ,
24+ name : DEFAULT_OS ,
2125 display_name : 'rhel8' ,
2226 run_on : DEFAULT_OS
2327 } ,
2428 {
25- name : 'windows-64-vs2019' ,
26- display_name : 'Windows (VS2019) ' ,
27- run_on : 'windows-64-vs2019-large' ,
29+ name : WINDOWS_OS ,
30+ display_name : 'Windows' ,
31+ run_on : WINDOWS_OS ,
2832 clientEncryption : false // TODO(NODE-3401): Unskip when Windows no longer fails to launch mongocryptd occasionally
2933 }
3034] . map ( osConfig => ( {
@@ -511,9 +515,9 @@ for (const nodeVersion of [LOWEST_LTS, LATEST_LTS]) {
511515}
512516
513517BUILD_VARIANTS . push ( {
514- name : 'macos-1100' ,
518+ name : MACOS_OS ,
515519 display_name : `MacOS 11 Node${ LATEST_LTS } ` ,
516- run_on : 'macos-1100' ,
520+ run_on : MACOS_OS ,
517521 expansions : {
518522 NODE_LTS_VERSION : LATEST_LTS ,
519523 CLIENT_ENCRYPTION : true
@@ -633,15 +637,15 @@ BUILD_VARIANTS.push({
633637BUILD_VARIANTS . push ( {
634638 name : 'mongosh_integration_tests' ,
635639 display_name : 'mongosh integration tests' ,
636- run_on : 'ubuntu1804-large' ,
640+ run_on : UBUNTU_OS ,
637641 tasks : mongoshTasks . map ( ( { name } ) => name )
638642} ) ;
639643
640644// special case for MONGODB-AWS authentication
641645BUILD_VARIANTS . push ( {
642646 name : 'ubuntu1804-test-mongodb-aws' ,
643647 display_name : 'MONGODB-AWS Auth test' ,
644- run_on : 'ubuntu1804-large' ,
648+ run_on : UBUNTU_OS ,
645649 expansions : {
646650 NODE_LTS_VERSION : LOWEST_LTS
647651 } ,
@@ -718,14 +722,14 @@ BUILD_VARIANTS.push({
718722BUILD_VARIANTS . push ( {
719723 name : 'rhel8-test-gcp-kms' ,
720724 display_name : 'GCP KMS Test' ,
721- run_on : 'debian11-small' ,
725+ run_on : DEBIAN_OS ,
722726 tasks : [ 'test_gcpkms_task_group' , 'test-gcpkms-fail-task' ]
723727} ) ;
724728
725729BUILD_VARIANTS . push ( {
726730 name : 'debian11-test-azure-kms' ,
727731 display_name : 'Azure KMS Test' ,
728- run_on : 'debian11-small' ,
732+ run_on : DEBIAN_OS ,
729733 batchtime : 20160 ,
730734 tasks : [ 'test_azurekms_task_group' , 'test-azurekms-fail-task' ]
731735} ) ;
0 commit comments