Skip to content

Commit c52b40c

Browse files
durranbaileympearson
durran
and
baileympearson
authored
test(NODE-4422): use shared lib in prose tests (#3354)
Co-authored-by: Bailey Pearson <[email protected]>
1 parent 8f16019 commit c52b40c

File tree

9 files changed

+156
-210
lines changed

9 files changed

+156
-210
lines changed

‎.evergreen/config.in.yml‎

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ functions:
154154
params:
155155
working_dir: "src"
156156
timeout_secs: 300
157+
shell: bash
157158
script: |
158159
${PREPARE_SHELL}
159160
@@ -164,6 +165,13 @@ functions:
164165
rm -f ./prepare_client_encryption.sh
165166
fi
166167
168+
export VERSION=${VERSION}
169+
export DRIVERS_TOOLS=${DRIVERS_TOOLS}
170+
171+
source ${PROJECT_DIRECTORY}/.evergreen/prepare-crypt-shared-lib.sh
172+
173+
echo "CRYPT_SHARED_LIB_PATH: $CRYPT_SHARED_LIB_PATH"
174+
167175
MONGODB_URI="${MONGODB_URI}" \
168176
AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \
169177
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
@@ -759,37 +767,6 @@ functions:
759767
--fault revoked
760768
761769
"run custom csfle tests":
762-
- command: shell.exec
763-
type: test
764-
params:
765-
silent: true
766-
working_dir: "src"
767-
script: |
768-
${PREPARE_SHELL}
769-
cat <<EOT > prepare_client_encryption.sh
770-
export CLIENT_ENCRYPTION=${CLIENT_ENCRYPTION}
771-
export CSFLE_KMS_PROVIDERS='${CSFLE_KMS_PROVIDERS}'
772-
export AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID}"
773-
export AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY}"
774-
export CSFLE_GIT_REF="${CSFLE_GIT_REF}"
775-
export CDRIVER_GIT_REF="${CDRIVER_GIT_REF}"
776-
EOT
777-
- command: shell.exec
778-
type: test
779-
params:
780-
working_dir: "src"
781-
timeout_secs: 60
782-
script: |
783-
${PREPARE_SHELL}
784-
785-
# Disable xtrace (just in case it was accidentally set).
786-
set +x
787-
. ./prepare_client_encryption.sh
788-
rm -f ./prepare_client_encryption.sh
789-
790-
MONGODB_URI="${MONGODB_URI}" bash ${PROJECT_DIRECTORY}/.evergreen/run-custom-csfle-tests.sh
791-
792-
"run custom csfle shared lib tests":
793770
- command: shell.exec
794771
type: test
795772
params:
@@ -824,9 +801,8 @@ functions:
824801
825802
source ${PROJECT_DIRECTORY}/.evergreen/prepare-crypt-shared-lib.sh
826803
export MONGODB_URI="${MONGODB_URI}"
827-
export CRYPT_SHARED_LIB_PATH
828804
829-
echo "setting CRYPT_SHARED_LIB_PATH: $CRYPT_SHARED_LIB_PATH"
805+
echo "CRYPT_SHARED_LIB_PATH: $CRYPT_SHARED_LIB_PATH"
830806
831807
bash ${PROJECT_DIRECTORY}/.evergreen/run-custom-csfle-tests.sh
832808

‎.evergreen/config.yml‎

Lines changed: 53 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ functions:
134134
params:
135135
working_dir: src
136136
timeout_secs: 300
137+
shell: bash
137138
script: |
138139
${PREPARE_SHELL}
139140
@@ -144,6 +145,13 @@ functions:
144145
rm -f ./prepare_client_encryption.sh
145146
fi
146147
148+
export VERSION=${VERSION}
149+
export DRIVERS_TOOLS=${DRIVERS_TOOLS}
150+
151+
source ${PROJECT_DIRECTORY}/.evergreen/prepare-crypt-shared-lib.sh
152+
153+
echo "CRYPT_SHARED_LIB_PATH: $CRYPT_SHARED_LIB_PATH"
154+
147155
MONGODB_URI="${MONGODB_URI}" \
148156
AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \
149157
MONGODB_API_VERSION="${MONGODB_API_VERSION}" \
@@ -725,36 +733,6 @@ functions:
725733
-v \
726734
--fault revoked
727735
run custom csfle tests:
728-
- command: shell.exec
729-
type: test
730-
params:
731-
silent: true
732-
working_dir: src
733-
script: |
734-
${PREPARE_SHELL}
735-
cat <<EOT > prepare_client_encryption.sh
736-
export CLIENT_ENCRYPTION=${CLIENT_ENCRYPTION}
737-
export CSFLE_KMS_PROVIDERS='${CSFLE_KMS_PROVIDERS}'
738-
export AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID}"
739-
export AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY}"
740-
export CSFLE_GIT_REF="${CSFLE_GIT_REF}"
741-
export CDRIVER_GIT_REF="${CDRIVER_GIT_REF}"
742-
EOT
743-
- command: shell.exec
744-
type: test
745-
params:
746-
working_dir: src
747-
timeout_secs: 60
748-
script: |
749-
${PREPARE_SHELL}
750-
751-
# Disable xtrace (just in case it was accidentally set).
752-
set +x
753-
. ./prepare_client_encryption.sh
754-
rm -f ./prepare_client_encryption.sh
755-
756-
MONGODB_URI="${MONGODB_URI}" bash ${PROJECT_DIRECTORY}/.evergreen/run-custom-csfle-tests.sh
757-
run custom csfle shared lib tests:
758736
- command: shell.exec
759737
type: test
760738
params:
@@ -789,9 +767,8 @@ functions:
789767
790768
source ${PROJECT_DIRECTORY}/.evergreen/prepare-crypt-shared-lib.sh
791769
export MONGODB_URI="${MONGODB_URI}"
792-
export CRYPT_SHARED_LIB_PATH
793770
794-
echo "setting CRYPT_SHARED_LIB_PATH: $CRYPT_SHARED_LIB_PATH"
771+
echo "CRYPT_SHARED_LIB_PATH: $CRYPT_SHARED_LIB_PATH"
795772
796773
bash ${PROJECT_DIRECTORY}/.evergreen/run-custom-csfle-tests.sh
797774
run custom snappy tests:
@@ -1716,7 +1693,7 @@ tasks:
17161693
vars:
17171694
NODE_LTS_NAME: erbium
17181695
TEST_NPM_SCRIPT: check:unit
1719-
- name: run-custom-csfle-tests-mongocryptd-pinned-commit
1696+
- name: run-custom-csfle-tests-5.0-pinned-commit
17201697
tags:
17211698
- run-custom-dependency-tests
17221699
commands:
@@ -1725,13 +1702,13 @@ tasks:
17251702
NODE_LTS_NAME: erbium
17261703
- func: bootstrap mongo-orchestration
17271704
vars:
1728-
VERSION: latest
1705+
VERSION: '5.0'
17291706
TOPOLOGY: replica_set
17301707
- func: bootstrap kms servers
17311708
- func: run custom csfle tests
17321709
vars:
17331710
CSFLE_GIT_REF: 41afd44ca04d246998969c53de4e0f22802b0c8a
1734-
- name: run-custom-csfle-tests-mongocryptd-master
1711+
- name: run-custom-csfle-tests-5.0-master
17351712
tags:
17361713
- run-custom-dependency-tests
17371714
commands:
@@ -1740,13 +1717,13 @@ tasks:
17401717
NODE_LTS_NAME: erbium
17411718
- func: bootstrap mongo-orchestration
17421719
vars:
1743-
VERSION: latest
1720+
VERSION: '5.0'
17441721
TOPOLOGY: replica_set
17451722
- func: bootstrap kms servers
17461723
- func: run custom csfle tests
17471724
vars:
17481725
CSFLE_GIT_REF: master
1749-
- name: run-custom-csfle-shared-lib-tests-pinned-commit
1726+
- name: run-custom-csfle-tests-rapid-pinned-commit
17501727
tags:
17511728
- run-custom-dependency-tests
17521729
commands:
@@ -1755,14 +1732,28 @@ tasks:
17551732
NODE_LTS_NAME: erbium
17561733
- func: bootstrap mongo-orchestration
17571734
vars:
1758-
VERSION: latest
1735+
VERSION: rapid
17591736
TOPOLOGY: replica_set
17601737
- func: bootstrap kms servers
1761-
- func: run custom csfle shared lib tests
1738+
- func: run custom csfle tests
17621739
vars:
1763-
VERSION: latest
17641740
CSFLE_GIT_REF: 41afd44ca04d246998969c53de4e0f22802b0c8a
1765-
- name: run-custom-csfle-shared-lib-tests-master
1741+
- name: run-custom-csfle-tests-rapid-master
1742+
tags:
1743+
- run-custom-dependency-tests
1744+
commands:
1745+
- func: install dependencies
1746+
vars:
1747+
NODE_LTS_NAME: erbium
1748+
- func: bootstrap mongo-orchestration
1749+
vars:
1750+
VERSION: rapid
1751+
TOPOLOGY: replica_set
1752+
- func: bootstrap kms servers
1753+
- func: run custom csfle tests
1754+
vars:
1755+
CSFLE_GIT_REF: master
1756+
- name: run-custom-csfle-tests-latest-pinned-commit
17661757
tags:
17671758
- run-custom-dependency-tests
17681759
commands:
@@ -1774,9 +1765,23 @@ tasks:
17741765
VERSION: latest
17751766
TOPOLOGY: replica_set
17761767
- func: bootstrap kms servers
1777-
- func: run custom csfle shared lib tests
1768+
- func: run custom csfle tests
1769+
vars:
1770+
CSFLE_GIT_REF: 41afd44ca04d246998969c53de4e0f22802b0c8a
1771+
- name: run-custom-csfle-tests-latest-master
1772+
tags:
1773+
- run-custom-dependency-tests
1774+
commands:
1775+
- func: install dependencies
1776+
vars:
1777+
NODE_LTS_NAME: erbium
1778+
- func: bootstrap mongo-orchestration
17781779
vars:
17791780
VERSION: latest
1781+
TOPOLOGY: replica_set
1782+
- func: bootstrap kms servers
1783+
- func: run custom csfle tests
1784+
vars:
17801785
CSFLE_GIT_REF: master
17811786
- name: test-latest-server-noauth
17821787
tags:
@@ -2339,10 +2344,12 @@ buildvariants:
23392344
- run-custom-snappy-tests
23402345
- run-bson-ext-integration
23412346
- run-bson-ext-unit
2342-
- run-custom-csfle-tests-mongocryptd-pinned-commit
2343-
- run-custom-csfle-tests-mongocryptd-master
2344-
- run-custom-csfle-shared-lib-tests-pinned-commit
2345-
- run-custom-csfle-shared-lib-tests-master
2347+
- run-custom-csfle-tests-5.0-pinned-commit
2348+
- run-custom-csfle-tests-5.0-master
2349+
- run-custom-csfle-tests-rapid-pinned-commit
2350+
- run-custom-csfle-tests-rapid-master
2351+
- run-custom-csfle-tests-latest-pinned-commit
2352+
- run-custom-csfle-tests-latest-master
23462353
- name: ubuntu1804-test-serverless
23472354
display_name: Serverless Test
23482355
run_on: ubuntu1804-test

0 commit comments

Comments
 (0)