Skip to content

Commit 8cdde24

Browse files
Merge branch 'mongodb:main' into NODE-7180
2 parents 67cca6f + a576b7d commit 8cdde24

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+414
-1456
lines changed

.eslintrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"root": true,
33
"parser": "@typescript-eslint/parser",
44
"parserOptions": {
5-
"ecmaVersion": 2020
5+
"ecmaVersion": 2023
66
},
77
"plugins": [
88
"simple-import-sort",
@@ -318,4 +318,4 @@
318318
}
319319
}
320320
]
321-
}
321+
}

.evergreen/ci_matrix_constants.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
const MONGODB_VERSIONS = ['latest', 'rapid', '8.0', '7.0', '6.0', '5.0', '4.4', '4.2'];
22
const versions = [
3-
{ codeName: 'gallium', versionNumber: 16, npmVersion: 9 },
4-
{ codeName: 'hydrogen', versionNumber: 18, npmVersion: 10 },
5-
{ codeName: 'iron', versionNumber: 20, npmVersion: 'latest' },
6-
{ codeName: 'jod', versionNumber: 22, npmVersion: 'latest' }
3+
{ codeName: 'iron', versionNumber: '20.19.0' },
4+
{ codeName: 'jod', versionNumber: 22 }
75
];
86
const NODE_VERSIONS = versions.map(({ versionNumber }) => versionNumber).sort();
97
const LOWEST_LTS = NODE_VERSIONS[0];

.evergreen/config.in.yml

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -388,20 +388,6 @@ functions:
388388
args:
389389
- .evergreen/run-ldap-tests.sh
390390

391-
"run data lake tests":
392-
- command: subprocess.exec
393-
type: test
394-
params:
395-
working_dir: src
396-
binary: bash
397-
env:
398-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
399-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
400-
MONGODB_URI: "mongodb://mhuser:pencil@localhost"
401-
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
402-
args:
403-
- .evergreen/run-data-lake-tests.sh
404-
405391
"run tls tests":
406392
- command: shell.exec
407393
type: test
@@ -715,20 +701,13 @@ functions:
715701
- .evergreen/docker/alpine.sh
716702

717703
tasks:
718-
- name: "test-atlas-data-lake"
719-
tags: ["datalake", "mongohouse"]
720-
commands:
721-
- func: "install dependencies"
722-
- func: "bootstrap mongohoused"
723-
- func: "run data lake tests"
724-
725704
- name: "test-gcpkms-task"
726705
commands:
727706
- command: expansions.update
728707
type: setup
729708
params:
730709
updates:
731-
- { key: NPM_VERSION, value: "9" }
710+
- { key: NODE_LTS_VERSION, value: "20.19.0" }
732711
- func: assume secrets manager role
733712
- func: "install dependencies"
734713
# Upload node driver to a GCP instance
@@ -748,7 +727,7 @@ tasks:
748727
type: setup
749728
params:
750729
updates:
751-
- { key: NPM_VERSION, value: "9" }
730+
- { key: NODE_LTS_VERSION, value: "20.19.0" }
752731
- { key: VERSION, value: latest }
753732
- { key: TOPOLOGY, value: server }
754733
- { key: AUTH, value: noauth }
@@ -760,6 +739,7 @@ tasks:
760739
binary: bash
761740
env:
762741
EXPECTED_GCPKMS_OUTCOME: "failure"
742+
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
763743
args:
764744
- src/.evergreen/run-gcp-kms-tests.sh
765745

@@ -769,7 +749,7 @@ tasks:
769749
type: setup
770750
params:
771751
updates:
772-
- { key: NPM_VERSION, value: "9" }
752+
- { key: NODE_LTS_VERSION, value: "20.19.0" }
773753
- func: "install dependencies"
774754
- func: assume secrets manager role
775755
- command: subprocess.exec
@@ -786,7 +766,7 @@ tasks:
786766
type: setup
787767
params:
788768
updates:
789-
- { key: NPM_VERSION, value: "9" }
769+
- { key: NODE_LTS_VERSION, value: "20.19.0" }
790770
- { key: VERSION, value: latest }
791771
- { key: TOPOLOGY, value: server }
792772
- { key: AUTH, value: noauth }
@@ -798,6 +778,7 @@ tasks:
798778
binary: bash
799779
env:
800780
EXPECTED_AZUREKMS_OUTCOME: "failure"
781+
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
801782
args:
802783
- src/.evergreen/run-azure-kms-tests.sh
803784

@@ -936,7 +917,7 @@ tasks:
936917
type: setup
937918
params:
938919
updates:
939-
- { key: NPM_VERSION, value: "9" }
920+
- { key: NODE_LTS_VERSION, value: "20.19.0" }
940921
- func: "install dependencies"
941922
- command: ec2.assume_role
942923
params:

0 commit comments

Comments
 (0)