File tree Expand file tree Collapse file tree 6 files changed +11
-38
lines changed Expand file tree Collapse file tree 6 files changed +11
-38
lines changed Original file line number Diff line number Diff line change @@ -2448,7 +2448,7 @@ tasks:
2448
2448
- func : bootstrap kms servers
2449
2449
- func : run custom csfle tests
2450
2450
vars :
2451
- CSFLE_GIT_REF : 1524eac203e4145e9f4835e519f1e4663ff15953
2451
+ CSFLE_GIT_REF : c56c70340093070b1ef5c8a28190187eea21a6e9
2452
2452
- name : run-custom-csfle-tests-5.0-master
2453
2453
tags :
2454
2454
- run-custom-dependency-tests
@@ -2478,7 +2478,7 @@ tasks:
2478
2478
- func : bootstrap kms servers
2479
2479
- func : run custom csfle tests
2480
2480
vars :
2481
- CSFLE_GIT_REF : 1524eac203e4145e9f4835e519f1e4663ff15953
2481
+ CSFLE_GIT_REF : c56c70340093070b1ef5c8a28190187eea21a6e9
2482
2482
- name : run-custom-csfle-tests-rapid-master
2483
2483
tags :
2484
2484
- run-custom-dependency-tests
@@ -2508,7 +2508,7 @@ tasks:
2508
2508
- func : bootstrap kms servers
2509
2509
- func : run custom csfle tests
2510
2510
vars :
2511
- CSFLE_GIT_REF : 1524eac203e4145e9f4835e519f1e4663ff15953
2511
+ CSFLE_GIT_REF : c56c70340093070b1ef5c8a28190187eea21a6e9
2512
2512
- name : run-custom-csfle-tests-latest-master
2513
2513
tags :
2514
2514
- run-custom-dependency-tests
Original file line number Diff line number Diff line change @@ -586,29 +586,7 @@ const oneOffFuncs = [
586
586
}
587
587
] ;
588
588
589
- const oneOffFuncAsTasks = oneOffFuncs . map ( oneOffFunc => ( {
590
- name : oneOffFunc . name ,
591
- tags : [ 'run-custom-dependency-tests' ] ,
592
- commands : [
593
- {
594
- func : 'install dependencies' ,
595
- vars : {
596
- NODE_LTS_NAME : LOWEST_LTS
597
- }
598
- } ,
599
- {
600
- func : 'bootstrap mongo-orchestration' ,
601
- vars : {
602
- VERSION : '5.0' ,
603
- TOPOLOGY : 'server' ,
604
- AUTH : 'auth'
605
- }
606
- } ,
607
- oneOffFunc
608
- ]
609
- } ) ) ;
610
-
611
- const FLE_PINNED_COMMIT = '1524eac203e4145e9f4835e519f1e4663ff15953'
589
+ const FLE_PINNED_COMMIT = 'c56c70340093070b1ef5c8a28190187eea21a6e9' ;
612
590
613
591
for ( const version of [ '5.0' , 'rapid' , 'latest' ] ) {
614
592
for ( const ref of [ FLE_PINNED_COMMIT , 'master' ] ) {
Original file line number Diff line number Diff line change 110
110
111
111
echo " npm version: $( npm -v) "
112
112
113
- # TODO(NODE-5180): remove --force option
114
- npm install --force " ${NPM_OPTIONS} "
113
+ npm install " ${NPM_OPTIONS} "
Original file line number Diff line number Diff line change @@ -52,8 +52,7 @@ popd # mongo-c-driver
52
52
53
53
pushd libmongocrypt/bindings/node
54
54
55
- # TODO(NODE-5180): remove --force option
56
- npm install --force --production --ignore-scripts
55
+ npm install --production --ignore-scripts
57
56
bash ./etc/build-static.sh
58
57
59
58
popd # libmongocrypt/bindings/node
@@ -82,8 +81,7 @@ pushd ../csfle-deps-tmp/libmongocrypt/bindings/node
82
81
killall mongocryptd || true
83
82
84
83
# only prod deps were installed earlier, install devDependencies here (except for mongodb!)
85
- # TODO(NODE-5180): remove --force option
86
- npm install --force --ignore-scripts
84
+ npm install --ignore-scripts
87
85
88
86
# copy mongodb into CSFLE's node_modules
89
87
rm -rf node_modules/mongodb
Original file line number Diff line number Diff line change @@ -10,8 +10,7 @@ if [ -z ${MONGODB_URI+omitted} ]; then echo "MONGODB_URI is unset" && exit 1; fi
10
10
if [ -z ${SERVERLESS_ATLAS_USER+omitted} ]; then echo " SERVERLESS_ATLAS_USER is unset" && exit 1; fi
11
11
if [ -z ${SERVERLESS_ATLAS_PASSWORD+omitted} ]; then echo " SERVERLESS_ATLAS_PASSWORD is unset" && exit 1; fi
12
12
13
- # TODO(NODE-5180): remove --force option
14
- npm install --force ' mongodb-client-encryption@alpha'
13
+ npm install mongodb-client-encryption
15
14
16
15
npx mocha \
17
16
--config test/mocha_mongodb.json \
Original file line number Diff line number Diff line change 52
52
source " $DRIVERS_TOOLS " /.evergreen/csfle/set-temp-creds.sh
53
53
fi
54
54
55
- # TODO(NODE-5180): remove --force option
56
- npm install --force ' mongodb-client-encryption@alpha'
57
- npm install --force @mongodb-js/zstd
58
- npm install --force snappy
55
+ npm install mongodb-client-encryption
56
+ npm install @mongodb-js/zstd
57
+ npm install snappy
59
58
60
59
export AUTH=$AUTH
61
60
export SINGLE_MONGOS_LB_URI=${SINGLE_MONGOS_LB_URI}
You can’t perform that action at this time.
0 commit comments