Skip to content

test(NODE-4395): add csfle master && pinned commit tasks to CI #3334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 29, 2022
Merged

test(NODE-4395): add csfle master && pinned commit tasks to CI #3334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9309a2
test: add csfle master && pinned commit tasks to CI
baileympearson Jul 26, 2022
1f24643
chore: default csfle tests to master instead of pinned commit
baileympearson Jul 27, 2022
eaf881c
chore: finish merge
baileympearson Jul 27, 2022
3db54e7
chore: use correct commit in custom csfle tests
baileympearson Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1653,7 +1653,7 @@ tasks:
- func: run bson-ext test
vars:
NODE_LTS_NAME: erbium
- name: run-custom-csfle-tests
- name: run-custom-csfle-tests-pinned-commit
tags:
- run-custom-dependency-tests
commands:
Expand All @@ -1666,6 +1666,23 @@ tasks:
TOPOLOGY: replica_set
- func: bootstrap kms servers
- func: run custom csfle tests
vars:
CSFLE_GIT_REF: c2712248e9f4909cdad723607ea5291d2eb48b91
- name: run-custom-csfle-tests-master
tags:
- run-custom-dependency-tests
commands:
- func: install dependencies
vars:
NODE_LTS_NAME: erbium
- func: bootstrap mongo-orchestration
vars:
VERSION: latest
TOPOLOGY: replica_set
- func: bootstrap kms servers
- func: run custom csfle tests
vars:
CSFLE_GIT_REF: master
- name: test-latest-server-noauth
tags:
- latest
Expand Down Expand Up @@ -2226,7 +2243,8 @@ buildvariants:
tasks:
- run-custom-snappy-tests
- run-bson-ext-test
- run-custom-csfle-tests
- run-custom-csfle-tests-pinned-commit
- run-custom-csfle-tests-master
- name: ubuntu1804-test-serverless
display_name: Serverless Test
run_on: ubuntu1804-test
Expand Down
36 changes: 34 additions & 2 deletions .evergreen/generate_evergreen_tasks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ const oneOffFuncAsTasks = oneOffFuncs.map(oneOffFunc => ({
}));

oneOffFuncAsTasks.push({
name: 'run-custom-csfle-tests',
name: 'run-custom-csfle-tests-pinned-commit',
tags: ['run-custom-dependency-tests'],
commands: [
{
Expand All @@ -554,7 +554,39 @@ oneOffFuncAsTasks.push({
}
},
{ func: 'bootstrap kms servers' },
{ func: 'run custom csfle tests' }
{
func: 'run custom csfle tests',
vars: {
CSFLE_GIT_REF: 'c2712248e9f4909cdad723607ea5291d2eb48b91'
}
}
]
});

oneOffFuncAsTasks.push({
name: 'run-custom-csfle-tests-master',
tags: ['run-custom-dependency-tests'],
commands: [
{
func: 'install dependencies',
vars: {
NODE_LTS_NAME: LOWEST_LTS
}
},
{
func: 'bootstrap mongo-orchestration',
vars: {
VERSION: 'latest',
TOPOLOGY: 'replica_set'
}
},
{ func: 'bootstrap kms servers' },
{
func: 'run custom csfle tests',
vars: {
CSFLE_GIT_REF: 'master'
}
}
]
});

Expand Down
3 changes: 1 addition & 2 deletions .evergreen/run-custom-csfle-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ ABS_PATH_TO_PATCH=$(pwd)
# Environment Variables:
# CSFLE_GIT_REF - set the git reference to checkout for a custom CSFLE version
# CDRIVER_GIT_REF - set the git reference to checkout for a custom CDRIVER version (this is for libbson)

CSFLE_GIT_REF=${CSFLE_GIT_REF:-c2712248e9f4909cdad723607ea5291d2eb48b91}
CSFLE_GIT_REF=${CSFLE_GIT_REF:-master}
CDRIVER_GIT_REF=${CDRIVER_GIT_REF:-1.17.6}

rm -rf ../csfle-deps-tmp
Expand Down