Skip to content

Commit 89d067a

Browse files
baileympearsonbaileympearson
committed
think that is it
1 parent 6a47bd8 commit 89d067a

File tree

3 files changed

+15
-49
lines changed

3 files changed

+15
-49
lines changed

‎.evergreen/config.in.yml‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,6 @@ functions:
366366
params:
367367
working_dir: "src"
368368
binary: bash
369-
env:
370-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
371369
add_expansions_to_env: true
372370
args:
373371
- -c
@@ -377,9 +375,7 @@ functions:
377375
params:
378376
working_dir: "src"
379377
binary: bash
380-
env:
381-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
382-
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
378+
add_expansions_to_env: true
383379
args:
384380
- .evergreen/run-atlas-tests.sh
385381

@@ -739,15 +735,12 @@ functions:
739735
args:
740736
- ${PROJECT_DIRECTORY}/.evergreen/run-x509-tests.sh
741737

742-
install mongodb-client-encryption:
738+
install mongodb-client-encryption from source:
743739
- command: subprocess.exec
744740
type: setup
745741
params:
746742
working_dir: "src"
747-
env:
748-
INSTALL_DIR: mongodb-client-encryption
749-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
750-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
743+
add_expansions_to_env: true
751744
binary: bash
752745
args:
753746
- ${PROJECT_DIRECTORY}/.evergreen/install-mongodb-client-encryption.sh
@@ -760,12 +753,6 @@ functions:
760753
type: test
761754
params:
762755
working_dir: "src"
763-
env:
764-
INSTALL_DIR: mongodb-client-encryption
765-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
766-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
767-
NODE_VERSION: ${NODE_VERSION}
768-
MONGODB_URI: ${MONGODB_URI}
769756
binary: bash
770757
add_expansions_to_env: true
771758
args:
@@ -800,8 +787,6 @@ tasks:
800787
params:
801788
binary: bash
802789
add_expansions_to_env: true
803-
env:
804-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
805790
args:
806791
- src/.evergreen/run-deployed-gcp-kms-tests.sh
807792

@@ -830,19 +815,17 @@ tasks:
830815

831816
- name: "test-azurekms-task"
832817
commands:
833-
- func: assume secrets manager role
834818
- command: expansions.update
835819
type: setup
836820
params:
837821
updates:
838822
- { key: NPM_VERSION, value: "9" }
839823
- func: "install dependencies"
824+
- func: assume secrets manager role
840825
- command: subprocess.exec
841826
type: setup
842827
params:
843828
binary: bash
844-
env:
845-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
846829
add_expansions_to_env: true
847830
args:
848831
- src/.evergreen/run-deployed-azure-kms-tests.sh

‎.evergreen/config.yml‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,6 @@ functions:
316316
params:
317317
working_dir: src
318318
binary: bash
319-
env:
320-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
321319
add_expansions_to_env: true
322320
args:
323321
- '-c'
@@ -327,9 +325,7 @@ functions:
327325
params:
328326
working_dir: src
329327
binary: bash
330-
env:
331-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
332-
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
328+
add_expansions_to_env: true
333329
args:
334330
- .evergreen/run-atlas-tests.sh
335331
run socks5 tests:
@@ -662,15 +658,12 @@ functions:
662658
binary: bash
663659
args:
664660
- ${PROJECT_DIRECTORY}/.evergreen/run-x509-tests.sh
665-
install mongodb-client-encryption:
661+
install mongodb-client-encryption from source:
666662
- command: subprocess.exec
667663
type: setup
668664
params:
669665
working_dir: src
670-
env:
671-
INSTALL_DIR: mongodb-client-encryption
672-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
673-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
666+
add_expansions_to_env: true
674667
binary: bash
675668
args:
676669
- ${PROJECT_DIRECTORY}/.evergreen/install-mongodb-client-encryption.sh
@@ -682,12 +675,6 @@ functions:
682675
type: test
683676
params:
684677
working_dir: src
685-
env:
686-
INSTALL_DIR: mongodb-client-encryption
687-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
688-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
689-
NODE_VERSION: ${NODE_VERSION}
690-
MONGODB_URI: ${MONGODB_URI}
691678
binary: bash
692679
add_expansions_to_env: true
693680
args:
@@ -721,8 +708,6 @@ tasks:
721708
params:
722709
binary: bash
723710
add_expansions_to_env: true
724-
env:
725-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
726711
args:
727712
- src/.evergreen/run-deployed-gcp-kms-tests.sh
728713
- name: test-gcpkms-fail-task
@@ -747,19 +732,17 @@ tasks:
747732
- src/.evergreen/run-gcp-kms-tests.sh
748733
- name: test-azurekms-task
749734
commands:
750-
- func: assume secrets manager role
751735
- command: expansions.update
752736
type: setup
753737
params:
754738
updates:
755739
- {key: NPM_VERSION, value: '9'}
756740
- func: install dependencies
741+
- func: assume secrets manager role
757742
- command: subprocess.exec
758743
type: setup
759744
params:
760745
binary: bash
761-
env:
762-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
763746
add_expansions_to_env: true
764747
args:
765748
- src/.evergreen/run-deployed-azure-kms-tests.sh
@@ -2176,7 +2159,7 @@ tasks:
21762159
- {key: CLIENT_ENCRYPTION, value: 'true'}
21772160
- func: install dependencies
21782161
- func: bootstrap mongo-orchestration
2179-
- func: install mongodb-client-encryption
2162+
- func: install mongodb-client-encryption from source
21802163
- func: assume secrets manager role
21812164
- func: run custom csfle tests
21822165
- name: run-custom-csfle-tests-rapid
@@ -2194,7 +2177,7 @@ tasks:
21942177
- {key: CLIENT_ENCRYPTION, value: 'true'}
21952178
- func: install dependencies
21962179
- func: bootstrap mongo-orchestration
2197-
- func: install mongodb-client-encryption
2180+
- func: install mongodb-client-encryption from source
21982181
- func: assume secrets manager role
21992182
- func: run custom csfle tests
22002183
- name: run-custom-csfle-tests-latest
@@ -2212,7 +2195,7 @@ tasks:
22122195
- {key: CLIENT_ENCRYPTION, value: 'true'}
22132196
- func: install dependencies
22142197
- func: bootstrap mongo-orchestration
2215-
- func: install mongodb-client-encryption
2198+
- func: install mongodb-client-encryption from source
22162199
- func: assume secrets manager role
22172200
- func: run custom csfle tests
22182201
- name: test-latest-driver-mongodb-client-encryption-6.0.0

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -662,21 +662,21 @@ BUILD_VARIANTS.push({
662662

663663
const customDependencyTests = [];
664664

665-
for (const version of ['5.0', 'rapid', 'latest']) {
665+
for (const serverVersion of ['5.0', 'rapid', 'latest']) {
666666
customDependencyTests.push({
667-
name: `run-custom-csfle-tests-${version}`,
667+
name: `run-custom-csfle-tests-${serverVersion}`,
668668
tags: ['run-custom-dependency-tests'],
669669
commands: [
670670
updateExpansions({
671671
NODE_LTS_VERSION: LOWEST_LTS,
672672
NPM_VERSION: 9,
673-
VERSION: version,
673+
VERSION: serverVersion,
674674
TOPOLOGY: 'replica_set',
675675
CLIENT_ENCRYPTION: true
676676
}),
677677
{ func: 'install dependencies' },
678678
{ func: 'bootstrap mongo-orchestration' },
679-
{ func: 'install mongodb-client-encryption' },
679+
{ func: 'install mongodb-client-encryption from source' },
680680
{ func: 'assume secrets manager role' },
681681
{ func: 'run custom csfle tests' }
682682
]

0 commit comments

Comments
 (0)